diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
index dac5c644b..5ca2ba136 100644
--- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
+++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
@@ -63,6 +63,13 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
+              <th>
+                <a ng-click="$ctrl.changeOrderBy('Availability')">
+                  Availability
+                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Availability' && !$ctrl.state.reverseOrder"></i>
+                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Availability' && $ctrl.state.reverseOrder"></i>
+                </a>
+              </th>
             </tr>
           </thead>
           <tbody>
@@ -77,6 +84,7 @@
               <td>{{ item.EngineVersion }}</td>
               <td ng-if="$ctrl.showIpAddressColumn">{{ item.Addr }}</td>
               <td><span class="label label-{{ item.Status | nodestatusbadge }}">{{ item.Status }}</span></td>
+              <td><span class="label label-{{ item.Availability | dockerNodeAvailabilityBadge }}">{{ item.Availability }}</span></td>
             </tr>
             <tr ng-if="!$ctrl.dataset">
               <td colspan="7" class="text-center text-muted">Loading...</td>
diff --git a/app/docker/filters/filters.js b/app/docker/filters/filters.js
index 315f62014..3ba22ef50 100644
--- a/app/docker/filters/filters.js
+++ b/app/docker/filters/filters.js
@@ -97,6 +97,18 @@ angular.module('portainer.docker')
     return 'success';
   };
 })
+.filter('dockerNodeAvailabilityBadge', function () {
+  'use strict';
+  return function (text) {
+    if (text === 'pause') {
+      return 'warning';
+    }
+    else if (text === 'drain') {
+      return 'danger';
+    }
+    return 'success';
+  };
+})
 .filter('trimcontainername', function () {
   'use strict';
   return function (name) {
diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js
index 112998a7a..160a96fbf 100644
--- a/app/extensions/storidge/filters/filters.js
+++ b/app/extensions/storidge/filters/filters.js
@@ -17,9 +17,9 @@ angular.module('extension.storidge')
 'use strict';
   return function (text) {
     var status = text ? _.toLower(text) : '';
-    if (status === 'cordoned') {
+    if (status === 'cordoned' || status === 'maintenance') {
       return 'orange-icon';
-    } else if (status === 'leaving') {
+    } else if (status === 'leaving' || status === 'failed') {
       return 'red-icon'
     }
     return 'green-icon';