diff --git a/geonode/static/geonode/css/base.css b/geonode/static/geonode/css/base.css
index eeed3a5525e..2b3194da78a 100644
--- a/geonode/static/geonode/css/base.css
+++ b/geonode/static/geonode/css/base.css
@@ -7530,10 +7530,18 @@ article.tab-pane {
   word-break: break-all;
   padding-left: 0px;
   padding-left: 12px;
+  display: flex;
+}
+.treeview .list-group-item .badge {
+  margin: auto;
+  margin-right: 0;
 }
 .treeview span.icon {
   margin-right: 5px;
 }
+.treeview span.node-icon {
+  padding-right: 17px;
+}
 span.icon.node-icon:before {
   font-family: FontAwesome;
   content: "\f07b";
@@ -7641,6 +7649,7 @@ nav.filter h4 {
 }
 nav.filter h4 a {
   color: white;
+  display: flex;
 }
 nav.filter h4 a.toggle {
   text-decoration: none;
diff --git a/geonode/static/geonode/less/base.less b/geonode/static/geonode/less/base.less
index 03690385f9b..dda66efa43b 100644
--- a/geonode/static/geonode/less/base.less
+++ b/geonode/static/geonode/less/base.less
@@ -893,12 +893,21 @@ article.tab-pane {
   word-break: break-all;
   padding-left: 0px;
   padding-left: 12px;
+  display: flex;
+}
+.treeview .list-group-item .badge{
+  margin: auto;
+  margin-right: 0;
 }
 
 .treeview span.icon {
   margin-right: 5px;
 }
 
+.treeview span.node-icon {
+  padding-right: 17px;
+}
+
 span.icon.node-icon:before {
   font-family: FontAwesome;
   content: "\f07b";
@@ -1027,6 +1036,7 @@ nav.filter {
 
     a {
       color: white;
+      display: flex;
     }
 
     a.toggle {