diff --git a/themes/compact.css b/themes/compact.css
index 478132e97..6dd8a313c 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -511,7 +511,17 @@ body.ttrss_main #feeds-holder #feedTree {
   text-rendering: optimizelegibility;
   font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
+  left: -3px;
+  height: 22px;
+  position: relative;
+  top: -3px;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode {
   font-weight: bold;
   display: none;
   font-size: 9px;
@@ -529,63 +539,54 @@ body.ttrss_main #feeds-holder #feedTree .counterNode {
   min-width: 23px;
   height: 14px;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.aux,
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   background: #f5f5f5;
   color: #6f6f6f;
   border-color: #dcdcdc;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   border-color: #257aa7;
   background: #ffffff;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
   background-color: #3ea447;
   border-color: #307f37;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
-  left: -3px;
-  height: 22px;
-  position: relative;
-  top: -3px;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread {
   font-weight: bold;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
-  border: 1px solid transparent;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
   border-color: #ddd transparent;
   background: white;
   color: #333;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitIcon.feed-icon {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.feed-icon {
   margin-right: 2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
   color: #555;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-archive {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
   color: #c77b2e;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-star {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
   color: #ffc069;
   font-size: 21px;
   left: -2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-rss_feed {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-rss_feed {
   color: #ff7c4b;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-whatshot {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-whatshot {
   color: #69C671;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-restore {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-restore {
   position: relative;
   top: -1px;
   font-weight: bold;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 3540cea47..632fc2966 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -511,7 +511,17 @@ body.ttrss_main #feeds-holder #feedTree {
   text-rendering: optimizelegibility;
   font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
+  left: -3px;
+  height: 22px;
+  position: relative;
+  top: -3px;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode {
   font-weight: bold;
   display: none;
   font-size: 9px;
@@ -529,63 +539,54 @@ body.ttrss_main #feeds-holder #feedTree .counterNode {
   min-width: 23px;
   height: 14px;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.aux,
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   background: #222;
   color: #e6e6e6;
   border-color: #080808;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   border-color: #b87d2c;
   background: #ffffff;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
   background-color: #3ea447;
   border-color: #307f37;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
-  left: -3px;
-  height: 22px;
-  position: relative;
-  top: -3px;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread {
   font-weight: bold;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
-  border: 1px solid transparent;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
   border-color: #222 transparent;
   background: #333;
   color: #333;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitIcon.feed-icon {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.feed-icon {
   margin-right: 2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
   color: #555;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-archive {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
   color: #c77b2e;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-star {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
   color: #ffc069;
   font-size: 21px;
   left: -2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-rss_feed {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-rss_feed {
   color: #ff7c4b;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-whatshot {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-whatshot {
   color: #69C671;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-restore {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-restore {
   position: relative;
   top: -1px;
   font-weight: bold;
diff --git a/themes/light.css b/themes/light.css
index b942af801..bccd92967 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -511,7 +511,17 @@ body.ttrss_main #feeds-holder #feedTree {
   text-rendering: optimizelegibility;
   font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
+  left: -3px;
+  height: 22px;
+  position: relative;
+  top: -3px;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode {
   font-weight: bold;
   display: none;
   font-size: 9px;
@@ -529,63 +539,54 @@ body.ttrss_main #feeds-holder #feedTree .counterNode {
   min-width: 23px;
   height: 14px;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.aux,
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   background: #f5f5f5;
   color: #6f6f6f;
   border-color: #dcdcdc;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   border-color: #257aa7;
   background: #ffffff;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
   background-color: #3ea447;
   border-color: #307f37;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
-  left: -3px;
-  height: 22px;
-  position: relative;
-  top: -3px;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread {
   font-weight: bold;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
-  border: 1px solid transparent;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
   border-color: #ddd transparent;
   background: white;
   color: #333;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitIcon.feed-icon {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.feed-icon {
   margin-right: 2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
   color: #555;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-archive {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
   color: #c77b2e;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-star {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
   color: #ffc069;
   font-size: 21px;
   left: -2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-rss_feed {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-rss_feed {
   color: #ff7c4b;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-whatshot {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-whatshot {
   color: #69C671;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-restore {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-restore {
   position: relative;
   top: -1px;
   font-weight: bold;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index c262ce9af..f0ceb55c0 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -583,100 +583,103 @@ body.ttrss_main {
 			text-rendering: optimizelegibility;
 			font-family : @fonts-ui;
 
-			.counterNode {
-				font-weight : bold;
-				display : none;
-				font-size : @font-size-tiny;
-				text-align : center;
-				border : 1px solid lighten(@color-accent, 5%);
-				color : white;
-				background : lighten(@color-accent, 5%);
-				border-radius : 4px;
-				vertical-align : middle;
-				float : right;
-				position : relative;
-				line-height : 14px;
-				margin-right : 8px;
-				margin-top : 2px;
-				min-width : 23px;
-				height : 14px;
-
-				&.aux, &.marked {
-					background : @color-panel-bg;
-					color : lighten(@default-text, 10%);
-					border-color : darken(@color-panel-bg, 10%);
+			.dijitTreeNode {
+				.loadingExpando {
+					left : -3px;
+					height : 22px;
+					position : relative;
+					top : -3px;
 				}
 
-				&.marked {
-					border-color : @color-accent-marked;
-					background : lighten(@color-accent-marked, 60%);
-				}
-			}
-
-			// fresh
-			.dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
-				background-color: darken(@color-checked, 15%);
-				border-color: darken(@color-checked, 25%);
-			}
+				.dijitTreeRow {
+					border : 1px solid transparent;
+					cursor : pointer;
+
+					.counterNode {
+						font-weight : bold;
+						display : none;
+						font-size : @font-size-tiny;
+						text-align : center;
+						border : 1px solid lighten(@color-accent, 5%);
+						color : white;
+						background : lighten(@color-accent, 5%);
+						border-radius : 4px;
+						vertical-align : middle;
+						float : right;
+						position : relative;
+						line-height : 14px;
+						margin-right : 8px;
+						margin-top : 2px;
+						min-width : 23px;
+						height : 14px;
+
+						&.aux, &.marked {
+							background : @color-panel-bg;
+							color : lighten(@default-text, 10%);
+							border-color : darken(@color-panel-bg, 10%);
+						}
 
-			.dijitTreeNode .loadingExpando {
-				left : -3px;
-				height : 22px;
-				position : relative;
-				top : -3px;
-			}
+						&.marked {
+							border-color : @color-accent-marked;
+							background : lighten(@color-accent-marked, 60%);
+						}
+					}
 
-			.dijitTreeRow .dijitTreeLabel.Unread {
-				font-weight : bold;
-			}
+					// fresh
+					&[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
+						background-color: darken(@color-checked, 15%);
+						border-color: darken(@color-checked, 25%);
+					}
 
-			.dijitTreeRow.Error .dijitTreeLabel {
-				color : red;
-			}
+					.dijitTreeLabel.Unread {
+						font-weight : bold;
+					}
 
-			.dijitTreeNode .dijitTreeRow {
-				border : 1px solid transparent;
-			}
+					&.Error .dijitTreeLabel {
+						color : red;
+					}
 
-			.dijitTreeNode .dijitTreeRowSelected {
-				box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1);
-				border-color : @border-default transparent;
-				background : @default-bg;
-				color : #333;
-			}
+					&.dijitTreeRowSelected {
+						box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1);
+						border-color : @border-default transparent;
+						background : @default-bg;
+						color : #333;
+					}
 
-			.dijitIcon.feed-icon {
-				margin-right : 2px;
-			}
+					.dijitIcon.feed-icon {
+						margin-right : 2px;
+					}
 
-			i.icon.icon-inbox {
-				color : #555;
-			}
+					i.icon.icon-inbox {
+						color : #555;
+					}
 
-			i.icon.icon-archive {
-				color : #c77b2e;
-			}
+					i.icon.icon-archive {
+						color : #c77b2e;
+					}
 
-			i.icon.icon-star {
-				position : relative;
-				color : @color-marked;
-				font-size : 21px;
-				left : -2px;
-			}
+					i.icon.icon-star {
+						position : relative;
+						color : @color-marked;
+						font-size : 21px;
+						left : -2px;
+					}
 
-			i.icon.icon-rss_feed {
-				color : @color-published;
-			}
+					i.icon.icon-rss_feed {
+						color : @color-published;
+					}
 
-			i.icon.icon-whatshot {
-				color : @color-checked;
-			}
+					i.icon.icon-whatshot {
+						color : @color-checked;
+					}
 
-			i.icon.icon-restore {
-				position : relative;
-				top : -1px;
-				font-weight : bold;
-				color : @color-accent;
+					i.icon.icon-restore {
+						position : relative;
+						top : -1px;
+						font-weight : bold;
+						color : @color-accent;
+					}
+				}
 			}
 		}
 	}
diff --git a/themes/night.css b/themes/night.css
index 57581baf6..196470dca 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -512,7 +512,17 @@ body.ttrss_main #feeds-holder #feedTree {
   text-rendering: optimizelegibility;
   font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
+  left: -3px;
+  height: 22px;
+  position: relative;
+  top: -3px;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode {
   font-weight: bold;
   display: none;
   font-size: 9px;
@@ -530,63 +540,54 @@ body.ttrss_main #feeds-holder #feedTree .counterNode {
   min-width: 23px;
   height: 14px;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.aux,
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   background: #222;
   color: #e6e6e6;
   border-color: #080808;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   border-color: #b87d2c;
   background: #ffffff;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
   background-color: #3ea447;
   border-color: #307f37;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
-  left: -3px;
-  height: 22px;
-  position: relative;
-  top: -3px;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread {
   font-weight: bold;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
-  border: 1px solid transparent;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
   border-color: #222 transparent;
   background: #333;
   color: #333;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitIcon.feed-icon {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.feed-icon {
   margin-right: 2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
   color: #555;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-archive {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
   color: #c77b2e;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-star {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
   color: #ffc069;
   font-size: 21px;
   left: -2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-rss_feed {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-rss_feed {
   color: #ff7c4b;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-whatshot {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-whatshot {
   color: #69C671;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-restore {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-restore {
   position: relative;
   top: -1px;
   font-weight: bold;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 03e2f0bf1..7ab5bf77f 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -512,7 +512,17 @@ body.ttrss_main #feeds-holder #feedTree {
   text-rendering: optimizelegibility;
   font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
+  left: -3px;
+  height: 22px;
+  position: relative;
+  top: -3px;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode {
   font-weight: bold;
   display: none;
   font-size: 9px;
@@ -530,63 +540,54 @@ body.ttrss_main #feeds-holder #feedTree .counterNode {
   min-width: 23px;
   height: 14px;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.aux,
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   background: #222;
   color: #e6e6e6;
   border-color: #080808;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode.marked {
   border-color: #257aa7;
   background: #ffffff;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread {
   background-color: #3ea447;
   border-color: #307f37;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando {
-  left: -3px;
-  height: 22px;
-  position: relative;
-  top: -3px;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread {
   font-weight: bold;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
-  border: 1px solid transparent;
-}
-body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRowSelected {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   box-shadow: -1px 0px 2px -1px rgba(0, 0, 0, 0.1);
   border-color: #222 transparent;
   background: #333;
   color: #333;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitIcon.feed-icon {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.feed-icon {
   margin-right: 2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
   color: #555;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-archive {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
   color: #c77b2e;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-star {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
   color: #ffc069;
   font-size: 21px;
   left: -2px;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-rss_feed {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-rss_feed {
   color: #ff7c4b;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-whatshot {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-whatshot {
   color: #69C671;
 }
-body.ttrss_main #feeds-holder #feedTree i.icon.icon-restore {
+body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-restore {
   position: relative;
   top: -1px;
   font-weight: bold;