diff --git a/themes/compact.css b/themes/compact.css
index ac04de2d9..b94a91de5 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -569,10 +569,10 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.
   margin-right: 2px;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
-  color: #555;
+  color: #888888;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
-  color: #c77b2e;
+  color: #cf7800;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index eda11cc55..58e0973bb 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -569,10 +569,10 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.
   margin-right: 2px;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
-  color: #555;
+  color: #ffffff;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
-  color: #c77b2e;
+  color: #cf7800;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
@@ -2069,24 +2069,24 @@ body.flat.ttrss_main #feeds-holder {
   background: #222;
   box-shadow: inset -1px 0px 2px -1px #666;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.aux,
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.marked {
   background: #222;
   color: #ccc;
   border-color: #333;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.marked {
   border-color: #b87d2c;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeRowSelected {
   background: #333;
   border-color: #333 transparent;
   color: #e6e6e6;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected .dijitTreeLabel {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeRowSelected .dijitTreeLabel {
   text-shadow: none;
 }
-body.flat.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow i.icon.icon-inbox {
   color: #999999;
 }
 body.flat.ttrss_main #headlines-frame {
diff --git a/themes/light.css b/themes/light.css
index 37b27f65e..46a19904c 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -569,10 +569,10 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.
   margin-right: 2px;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
-  color: #555;
+  color: #888888;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
-  color: #c77b2e;
+  color: #cf7800;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 1c040e93f..1d0564901 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -651,11 +651,11 @@ body.ttrss_main {
 					}
 
 					i.icon.icon-inbox {
-						color : #555;
+						color : lighten(@default-text, 20%);
 					}
 
 					i.icon.icon-archive {
-						color : #c77b2e;
+						color : darken(@color-marked, 30%);
 					}
 
 					i.icon.icon-star {
diff --git a/themes/night.css b/themes/night.css
index 7eb5697db..ca1bbfc30 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -570,10 +570,10 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.
   margin-right: 2px;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
-  color: #555;
+  color: #ffffff;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
-  color: #c77b2e;
+  color: #cf7800;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
@@ -2070,24 +2070,24 @@ body.flat.ttrss_main #feeds-holder {
   background: #222;
   box-shadow: inset -1px 0px 2px -1px #666;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.aux,
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.marked {
   background: #222;
   color: #ccc;
   border-color: #333;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.marked {
   border-color: #b87d2c;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeRowSelected {
   background: #333;
   border-color: #333 transparent;
   color: #e6e6e6;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected .dijitTreeLabel {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeRowSelected .dijitTreeLabel {
   text-shadow: none;
 }
-body.flat.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow i.icon.icon-inbox {
   color: #999999;
 }
 body.flat.ttrss_main #headlines-frame {
diff --git a/themes/night_base.less b/themes/night_base.less
index 78056d710..e04c74639 100644
--- a/themes/night_base.less
+++ b/themes/night_base.less
@@ -65,28 +65,30 @@ body.flat.ttrss_main {
 		box-shadow : inset -1px 0px 2px -1px @border-light;
 
 		#feedTree {
-			.counterNode.aux, .counterNode.marked {
-				background: @color-panel-bg;
-				color: @default-text;
-				border-color: @default-bg;
-			}
+			.dijitTreeRow {
+				.counterNode.aux, .counterNode.marked {
+					background: @color-panel-bg;
+					color: @default-text;
+					border-color: @default-bg;
+				}
 
-			.counterNode.marked {
-				border-color : @color-accent-marked;
-			}
+				.counterNode.marked {
+					border-color : @color-accent-marked;
+				}
 
-			.dijitTreeRowSelected {
-				background : @default-bg;
-				border-color : @default-bg transparent;
-				color : @fg-light;
-			}
+				.dijitTreeRowSelected {
+					background : @default-bg;
+					border-color : @default-bg transparent;
+					color : @fg-light;
+				}
 
-			.dijitTreeRowSelected .dijitTreeLabel {
-				text-shadow : none;
-			}
+				.dijitTreeRowSelected .dijitTreeLabel {
+					text-shadow : none;
+				}
 
-			i.icon.icon-inbox {
-				color : darken(@default-text, 20%);
+				i.icon.icon-inbox {
+					color : darken(@default-text, 20%);
+				}
 			}
 		}
 	}
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 1e3c44582..6afc478d2 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -570,10 +570,10 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitIcon.
   margin-right: 2px;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-inbox {
-  color: #555;
+  color: #ffffff;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-archive {
-  color: #c77b2e;
+  color: #cf7800;
 }
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow i.icon.icon-star {
   position: relative;
@@ -2070,24 +2070,24 @@ body.flat.ttrss_main #feeds-holder {
   background: #222;
   box-shadow: inset -1px 0px 2px -1px #666;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux,
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.aux,
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.marked {
   background: #222;
   color: #ccc;
   border-color: #333;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .counterNode.marked {
   border-color: #257aa7;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeRowSelected {
   background: #333;
   border-color: #333 transparent;
   color: #e6e6e6;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected .dijitTreeLabel {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeRowSelected .dijitTreeLabel {
   text-shadow: none;
 }
-body.flat.ttrss_main #feeds-holder #feedTree i.icon.icon-inbox {
+body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRow i.icon.icon-inbox {
   color: #999999;
 }
 body.flat.ttrss_main #headlines-frame {