diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
index 58f55a707..0f1d1f077 100644
--- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
+++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
@@ -71,7 +71,7 @@
               <td>{{ item.IP }}</td>
               <td>{{ item.Role }}</td>
               <td>
-                <i class="fa fa-heartbeat space-right green-icon"></i>
+                <i class="fa fa-heartbeat space-right {{ item.Status | nodeStatusBadge }}"></i>
                 {{ item.Status }}
               </td>
             </tr>
diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js
index 82c9414e7..46c50ff46 100644
--- a/app/extensions/storidge/filters/filters.js
+++ b/app/extensions/storidge/filters/filters.js
@@ -12,4 +12,16 @@ angular.module('extension.storidge')
     }
     return 'info';
   };
+})
+.filter('nodeStatusBadge', function () {
+'use strict';
+  return function (text) {
+    var status = _.toLower(text);
+    if (status === 'maintenance') {
+      return 'orange-icon';
+    } else if (status === 'alert') {
+      return 'red-icon';
+    }
+    return 'green-icon';
+  };
 });
\ No newline at end of file
diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html
index dfe611895..3dd41243d 100644
--- a/app/extensions/storidge/views/cluster/cluster.html
+++ b/app/extensions/storidge/views/cluster/cluster.html
@@ -22,7 +22,7 @@
             </tr>
             <tr>
               <td>Status</td>
-              <td><i class="fa fa-heartbeat space-right green-icon"></i> {{ clusterInfo.Status }}</td>
+              <td><i class="fa fa-heartbeat space-right {{ clusterInfo.Status | nodeStatusBadge }}"></i> {{ clusterInfo.Status }}</td>
             </tr>
             <tr>
               <td>Version</td>