diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java
index bffec0a8b066ee492c78241a0a2f1d353ba9fe1c..a96052451ad86305524de8def274b0cdb56acd50 100644
--- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java
+++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/service/NodesHtmlGenerator.java
@@ -146,11 +146,8 @@ public class NodesHtmlGenerator {
 
     private void addNodeIcon(NodeInfo nodeInfo, Element cell) {
 
-        Element iconContainer = cell;
-
         if (nodeInfo.isBusy()) {
             Element loadingWrapper = cell.appendElement("span");
-            iconContainer = loadingWrapper;
             loadingWrapper.addClass("node-busy");
             Element spinner = loadingWrapper.appendElement("span");
             spinner.attr("role", "status");
@@ -177,7 +174,7 @@ public class NodesHtmlGenerator {
             }
         }
 
-        iconContainer.append(" ");
+        cell.append(" ");
     }
 
     private void addLink(NodeInfo nodeInfo, Element cell) {
@@ -193,7 +190,7 @@ public class NodesHtmlGenerator {
             link.attr("href", href);
             link.text(nodeInfo.getName());
         } else {
-            cell.text(nodeInfo.getName());
+            cell.appendText(nodeInfo.getName());
         }
     }
 
diff --git a/vospace-ui-frontend/src/App.vue b/vospace-ui-frontend/src/App.vue
index 6750c693f1388b7b7a41278d3030ba08f858f8ad..4844d3e92981fb5fb74b37d06bdaa18e4a88a26d 100644
--- a/vospace-ui-frontend/src/App.vue
+++ b/vospace-ui-frontend/src/App.vue
@@ -83,7 +83,6 @@ export default {
 
 .node-busy {
   position: relative;
-  padding-right: 3px;
 }
 
 .node-busy .spinner-border {
@@ -95,4 +94,8 @@ export default {
   top: -7px;
   color: #3293f2;
 }
+
+.node-busy + .icon {
+  margin-right: 3px;
+}
 </style>