diff --git a/js/app/map/map.js b/js/app/map/map.js
index 070738d7..18db09ef 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -1662,6 +1662,10 @@ define([
         headElement.on('hidden', function(e, editable) {
             // show tooltip "again" on xEditable hidden
             system.toggleSystemTooltip('show', {show: true});
+
+            // if system with changed (e.g. long alias) -> revalidate system
+            let map  = MapUtil.getMapInstance(system.attr('data-mapid'));
+            map.revalidate(system.attr('id'));
         });
     };
 
diff --git a/js/app/util.js b/js/app/util.js
index f6cfc318..3b12d641 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -1734,11 +1734,12 @@ define([
     let getSystemPilotsTable = users => {
         let table = '';
         if(users.length > 0){
-
             let getRow = (statusClass, userName, shipName, shipTypeName, mass) => {
                 let row = '<tr>';
-                row += '<td>';
+                row += '<td class="text-right">';
+                row += '<small>';
                 row +=  statusClass !== null ? '<i class="fas fa-circle ' + config.userStatusClass + ' ' + statusClass + '">' : '';
+                row += '</small>';
                 row += '</td>';
                 row += '<td>';
                 row += userName;
@@ -1749,7 +1750,7 @@ define([
                 row += '<td class="text-right txt-color txt-color-orangeLight">';
                 row += shipTypeName;
                 row += '</td>';
-                row += '<td class="text-right txt-color">';
+                row += '<td class="text-right">';
                 row += mass;
                 row += '</td>';
                 row += '</tr>';
diff --git a/public/js/v1.3.6/app/map/map.js b/public/js/v1.3.6/app/map/map.js
index 070738d7..18db09ef 100644
--- a/public/js/v1.3.6/app/map/map.js
+++ b/public/js/v1.3.6/app/map/map.js
@@ -1662,6 +1662,10 @@ define([
         headElement.on('hidden', function(e, editable) {
             // show tooltip "again" on xEditable hidden
             system.toggleSystemTooltip('show', {show: true});
+
+            // if system with changed (e.g. long alias) -> revalidate system
+            let map  = MapUtil.getMapInstance(system.attr('data-mapid'));
+            map.revalidate(system.attr('id'));
         });
     };
 
diff --git a/public/js/v1.3.6/app/util.js b/public/js/v1.3.6/app/util.js
index f6cfc318..3b12d641 100644
--- a/public/js/v1.3.6/app/util.js
+++ b/public/js/v1.3.6/app/util.js
@@ -1734,11 +1734,12 @@ define([
     let getSystemPilotsTable = users => {
         let table = '';
         if(users.length > 0){
-
             let getRow = (statusClass, userName, shipName, shipTypeName, mass) => {
                 let row = '<tr>';
-                row += '<td>';
+                row += '<td class="text-right">';
+                row += '<small>';
                 row +=  statusClass !== null ? '<i class="fas fa-circle ' + config.userStatusClass + ' ' + statusClass + '">' : '';
+                row += '</small>';
                 row += '</td>';
                 row += '<td>';
                 row += userName;
@@ -1749,7 +1750,7 @@ define([
                 row += '<td class="text-right txt-color txt-color-orangeLight">';
                 row += shipTypeName;
                 row += '</td>';
-                row += '<td class="text-right txt-color">';
+                row += '<td class="text-right">';
                 row += mass;
                 row += '</td>';
                 row += '</tr>';