diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index 716a4c941..5adb96a6c 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -104,9 +104,9 @@
       </div>
     </div>
     <div class="flex flex-row w-full">
-      <span class="small text-muted mt-1" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-        <pr-icon icon="'info'" feather="true" class-name="'icon'"></pr-icon>
-        System resources are hidden, this can be changed in the table settings.
+      <span class="small text-muted mt-1 vertical-center" ng-if="!$ctrl.settings.showSystem" authorization="K8sAccessSystemNamespaces">
+        <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
+        <span> System resources are hidden, this can be changed in the table settings. </span>
       </span>
     </div>
   </div>
@@ -122,8 +122,8 @@
                 <label for="select_all"></label>
               </span>
               <div class="cursor-pointer vertical-center" ng-click="$ctrl.expandAll()">
-                <pr-icon ng-if="$ctrl.state.expandAll" icon="'chevron-down'" feather="true" class-name="'icon'"></pr-icon>
-                <pr-icon ng-if="!$ctrl.state.expandAll" icon="'chevron-right'" feather="true" class-name="'icon'"></pr-icon>
+                <pr-icon ng-if="$ctrl.state.expandAll" icon="'chevron-down'" feather="true"></pr-icon>
+                <pr-icon ng-if="!$ctrl.state.expandAll" icon="'chevron-right'" feather="true"></pr-icon>
               </div>
             </div>
           </th>
@@ -174,8 +174,8 @@
               ></table-column-header>
               <div class="flex flex-row no-wrap gap-1 items-center" uib-dropdown-toggle>
                 <span class="table-filter">Filters</span>
-                <pr-icon ng-if="!$ctrl.filters.state.enabled" icon="'filter'" class-name="'icon'" feather="true"></pr-icon>
-                <pr-icon ng-if="$ctrl.filters.state.enabled" icon="'check'" class-name="'icon'" feather="true"></pr-icon>
+                <pr-icon ng-if="!$ctrl.filters.state.enabled" icon="'filter'" feather="true"></pr-icon>
+                <pr-icon ng-if="$ctrl.filters.state.enabled" icon="'check'" feather="true"></pr-icon>
               </div>
               <div class="dropdown-menu" uib-dropdown-menu>
                 <div class="tableMenu">
@@ -231,8 +231,8 @@
               <label for="select_{{ $index }}"></label>
             </span>
             <div ng-if="$ctrl.isExpandable(item)" class="vertical-center">
-              <pr-icon ng-if="$ctrl.isItemExpanded(item)" icon="'chevron-down'" feather="true" class-name="'icon'"></pr-icon>
-              <pr-icon ng-if="!$ctrl.isItemExpanded(item)" icon="'chevron-right'" feather="true" class-name="'icon'"></pr-icon>
+              <pr-icon ng-if="$ctrl.isItemExpanded(item)" icon="'chevron-down'" feather="true"></pr-icon>
+              <pr-icon ng-if="!$ctrl.isItemExpanded(item)" icon="'chevron-right'" feather="true"></pr-icon>
             </div>
           </td>
           <td>
diff --git a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
index 5bdae7212..af46f6ae5 100644
--- a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
@@ -1,198 +1,221 @@
 <div class="datatable">
-  <rd-widget>
-    <rd-widget-body classes="no-padding">
-      <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
-        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
-          System resources are hidden, this can be changed in the table settings.
-        </span>
-        <div class="settings">
-          <span
-            class="setting"
-            ng-class="{ 'setting-active': $ctrl.settings.open }"
-            uib-dropdown
-            dropdown-append-to-body
-            auto-close="disabled"
-            is-open="$ctrl.settings.open"
-            data-cy="k8s-vol-table-settings"
-          >
-            <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table settings</span>
-            <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
-              <div class="tableMenu">
-                <div class="menuHeader"> Table settings </div>
-                <div class="menuContent">
-                  <div>
-                    <div class="md-checkbox" ng-if="$ctrl.isAdmin">
-                      <input id="setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
-                      <label for="setting_show_system">Show system resources</label>
-                    </div>
-                    <div class="md-checkbox">
-                      <input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
-                      <label for="setting_auto_refresh">Auto refresh</label>
-                    </div>
-                    <div ng-if="$ctrl.settings.repeater.autoRefresh">
-                      <label for="settings_refresh_rate"> Refresh rate </label>
-                      <select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
-                        <option value="10">10s</option>
-                        <option value="30">30s</option>
-                        <option value="60">1min</option>
-                        <option value="120">2min</option>
-                        <option value="300">5min</option>
-                      </select>
-                      <span>
-                        <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-top: 7px; display: none"></i>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-                <div>
-                  <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8s-vol-table-settings-close">Close</a>
-                </div>
-              </div>
-            </div>
-          </span>
-        </div>
+  <!-- toolbar header actions and settings -->
+  <div class="toolBar !flex-col gap-1">
+    <div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full">
+      <div class="toolBarTitle vertical-center">
+        <pr-icon icon="'database'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
+        Volumes
       </div>
-      <div class="actionBar">
-        <button type="button" class="btn btn-sm btn-danger" ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
-          <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
-        </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sVolume-deployFromManifestButton">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Create from manifest
-        </button>
-      </div>
-      <div class="searchBar">
-        <i class="fa fa-search searchIcon" aria-hidden="true"></i>
+      <div class="searchBar vertical-center">
+        <pr-icon icon="'search'" feather="true"></pr-icon>
         <input
           type="text"
-          class="searchInput"
+          class="searchInput !mr-0"
           ng-model="$ctrl.state.textFilter"
           ng-change="$ctrl.onTextFilterChange()"
-          placeholder="Search..."
+          placeholder="Search for a volume..."
           auto-focus
           ng-model-options="{ debounce: 300 }"
         />
       </div>
-      <div class="table-responsive">
-        <table class="table table-hover nowrap-cells">
-          <thead>
-            <tr>
-              <th>
-                <span class="md-checkbox">
-                  <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
-                  <label for="select_all"></label>
-                </span>
-                <a ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.Name')">
-                  Name
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.Name' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.Name' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('ResourcePool.Namespace.Name')">
-                  Namespace
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourcePool.Namespace.Name' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourcePool.Namespace.Name' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.Applications[0].Name')">
-                  Used by
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.Applications[0].Name' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.Applications[0].Name' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.StorageClass.Name')">
-                  Storage
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.StorageClass.Name' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.StorageClass.Name' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.Storage')">
-                  Size
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.Storage' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.Storage' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.CreationDate')">
-                  Created
-                  <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.CreationDate' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PersistentVolumeClaim.CreationDate' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | filter:$ctrl.isDisplayed | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
-              ng-class="{ active: item.Checked }"
-            >
-              <td>
-                <span class="md-checkbox">
-                  <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" ng-disabled="$ctrl.disableRemove(item)" />
-                  <label for="select_{{ $index }}"></label>
-                </span>
-                <a ui-sref="kubernetes.volumes.volume({ namespace: item.ResourcePool.Namespace.Name, name: item.PersistentVolumeClaim.Name })">{{
-                  item.PersistentVolumeClaim.Name
-                }}</a>
-                <span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemNamespace(item)">system</span>
-                <span class="label label-primary image-tag label-margins" ng-if="!$ctrl.isSystemNamespace(item) && $ctrl.isExternalVolume(item)">external</span>
-                <span class="label label-warning image-tag label-margins" ng-if="!$ctrl.isSystemNamespace(item) && !$ctrl.isUsed(item)">unused</span>
-              </td>
-              <td>
-                <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool.Namespace.Name })">{{ item.ResourcePool.Namespace.Name }}</a>
-              </td>
-              <td>
-                <a
-                  ng-if="item.Applications.length"
-                  ui-sref="kubernetes.applications.application({ name: item.Applications[0].Name, namespace: item.ResourcePool.Namespace.Name })"
-                  >{{ item.Applications[0].Name }}</a
-                >
-                <span ng-if="item.Applications.length > 1"> + {{ item.Applications.length - 1 }}</span>
-                <span ng-if="!item.Applications.length">-</span>
-              </td>
-              <td>
-                {{ item.PersistentVolumeClaim.StorageClass.Name }}
-              </td>
-              <td>
-                {{ item.PersistentVolumeClaim.Storage }}
-              </td>
-              <td>
-                {{ item.PersistentVolumeClaim.CreationDate | getisodate }}
-                {{ item.PersistentVolumeClaim.ApplicationOwner ? 'by ' + item.PersistentVolumeClaim.ApplicationOwner : '' }}
-              </td>
-            </tr>
-            <tr ng-if="!$ctrl.dataset">
-              <td colspan="6" class="text-center text-muted">Loading...</td>
-            </tr>
-            <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="6" class="text-center text-muted">No volume available.</td>
-            </tr>
-          </tbody>
-        </table>
+      <div class="actionBar !gap-3 !mr-0">
+        <button
+          type="button"
+          class="btn btn-sm btn-dangerlight vertical-center !ml-0"
+          ng-disabled="$ctrl.state.selectedItemCount === 0"
+          ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
+        >
+          <pr-icon icon="'trash-2'" feather="true"></pr-icon>
+          Remove
+        </button>
+        <button type="button" class="btn btn-sm btn-primary vertical-center !ml-0" ui-sref="kubernetes.deploy" data-cy="k8sVolume-deployFromManifestButton">
+          <pr-icon icon="'plus'" feather="true" class-name="'!h-3'"></pr-icon>
+          Create from manifest
+        </button>
       </div>
-      <div class="footer" ng-if="$ctrl.dataset">
-        <div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
-        <div class="paginationControls">
-          <form class="form-inline">
-            <span class="limitSelector">
-              <span style="margin-right: 5px"> Items per page </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
-                <option value="0">All</option>
-                <option value="10">10</option>
-                <option value="25">25</option>
-                <option value="50">50</option>
-                <option value="100">100</option>
-              </select>
+      <div class="settings">
+        <span
+          class="setting"
+          ng-class="{ 'setting-active': $ctrl.settings.open }"
+          uib-dropdown
+          dropdown-append-to-body
+          auto-close="disabled"
+          is-open="$ctrl.settings.open"
+          data-cy="k8s-vol-table-settings"
+        >
+          <span uib-dropdown-toggle aria-label="Settings">
+            <pr-icon icon="'more-vertical'" feather="true" class-name="'!mr-0 !h-4'"></pr-icon>
+          </span>
+          <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
+            <div class="tableMenu">
+              <div class="menuHeader"> Table settings </div>
+              <div class="menuContent">
+                <div>
+                  <div class="md-checkbox" ng-if="$ctrl.isAdmin">
+                    <input id="setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
+                    <label for="setting_show_system">Show system resources</label>
+                  </div>
+                  <div class="md-checkbox">
+                    <input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
+                    <label for="setting_auto_refresh">Auto refresh</label>
+                  </div>
+                  <div ng-if="$ctrl.settings.repeater.autoRefresh">
+                    <label for="settings_refresh_rate"> Refresh rate </label>
+                    <select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
+                      <option value="10">10s</option>
+                      <option value="30">30s</option>
+                      <option value="60">1min</option>
+                      <option value="120">2min</option>
+                      <option value="300">5min</option>
+                    </select>
+                    <span>
+                      <pr-icon id="refreshRateChange" icon="'check'" feather="true" mode="'success'" size="'sm'"></pr-icon>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div>
+                <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8s-vol-table-settings-close">Close</a>
+              </div>
+            </div>
+          </div>
+        </span>
+      </div>
+    </div>
+    <div class="flex flex-row w-full" ng-if="!ctrl.isAdmin && !$ctrl.settings.showSystem">
+      <span class="small text-muted mt-1 vertical-center">
+        <pr-icon icon="'info'" feather="true" mode="'primary'"></pr-icon>
+        <span> System resources are hidden, this can be changed in the table settings. </span>
+      </span>
+    </div>
+  </div>
+  <div class="table-responsive">
+    <table class="table table-hover nowrap-cells">
+      <thead>
+        <tr>
+          <th>
+            <div class="flex flex-no-wrap items-center">
+              <span class="md-checkbox vertical-center">
+                <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
+                <label for="select_all"></label>
+              </span>
+              <table-column-header
+                col-title="'Name'"
+                can-sort="true"
+                is-sorted="$ctrl.state.orderBy === 'PersistentVolumeClaim.Name'"
+                is-sorted-desc="$ctrl.state.orderBy === 'PersistentVolumeClaim.Name' && $ctrl.state.reverseOrder"
+                ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.Name')"
+              ></table-column-header>
+            </div>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Namespace'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'ResourcePool.Namespace.Name'"
+              is-sorted-desc="$ctrl.state.orderBy === 'ResourcePool.Namespace.Name' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('ResourcePool.Namespace.Name')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Used by'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'PersistentVolumeClaim.Applications[0].Name'"
+              is-sorted-desc="$ctrl.state.orderBy === 'PersistentVolumeClaim.Applications[0].Name' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.Applications[0].Name')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Storage'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'PersistentVolumeClaim.StorageClass.Name'"
+              is-sorted-desc="$ctrl.state.orderBy === 'PersistentVolumeClaim.StorageClass.Name' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.StorageClass.Name')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Size'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'PersistentVolumeClaim.Storage'"
+              is-sorted-desc="$ctrl.state.orderBy === 'PersistentVolumeClaim.Storage' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.Storage')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Created'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'PersistentVolumeClaim.CreationDate'"
+              is-sorted-desc="$ctrl.state.orderBy === 'PersistentVolumeClaim.CreationDate' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('PersistentVolumeClaim.CreationDate')"
+            ></table-column-header>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | filter:$ctrl.isDisplayed | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
+          ng-class="{ active: item.Checked }"
+        >
+          <td>
+            <span class="md-checkbox">
+              <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" ng-disabled="$ctrl.disableRemove(item)" />
+              <label for="select_{{ $index }}"></label>
             </span>
-            <dir-pagination-controls max-size="5"></dir-pagination-controls>
-          </form>
-        </div>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
+            <a ui-sref="kubernetes.volumes.volume({ namespace: item.ResourcePool.Namespace.Name, name: item.PersistentVolumeClaim.Name })">{{ item.PersistentVolumeClaim.Name }}</a>
+            <span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemNamespace(item)">system</span>
+            <span class="label label-primary image-tag label-margins" ng-if="!$ctrl.isSystemNamespace(item) && $ctrl.isExternalVolume(item)">external</span>
+            <span class="label label-warning image-tag label-margins" ng-if="!$ctrl.isSystemNamespace(item) && !$ctrl.isUsed(item)">unused</span>
+          </td>
+          <td>
+            <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool.Namespace.Name })">{{ item.ResourcePool.Namespace.Name }}</a>
+          </td>
+          <td>
+            <a ng-if="item.Applications.length" ui-sref="kubernetes.applications.application({ name: item.Applications[0].Name, namespace: item.ResourcePool.Namespace.Name })">{{
+              item.Applications[0].Name
+            }}</a>
+            <span ng-if="item.Applications.length > 1"> + {{ item.Applications.length - 1 }}</span>
+            <span ng-if="!item.Applications.length">-</span>
+          </td>
+          <td>
+            {{ item.PersistentVolumeClaim.StorageClass.Name }}
+          </td>
+          <td>
+            {{ item.PersistentVolumeClaim.Storage }}
+          </td>
+          <td>
+            {{ item.PersistentVolumeClaim.CreationDate | getisodate }}
+            {{ item.PersistentVolumeClaim.ApplicationOwner ? 'by ' + item.PersistentVolumeClaim.ApplicationOwner : '' }}
+          </td>
+        </tr>
+        <tr ng-if="!$ctrl.dataset">
+          <td colspan="6" class="text-center text-muted">Loading...</td>
+        </tr>
+        <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
+          <td colspan="6" class="text-center text-muted">No volume available.</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="footer pl-5" ng-if="$ctrl.dataset">
+    <div class="infoBar !ml-0" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
+    <div class="paginationControls">
+      <form class="form-inline">
+        <span class="limitSelector">
+          <span style="margin-right: 5px"> Items per page </span>
+          <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+            <option value="0">All</option>
+            <option value="10">10</option>
+            <option value="25">25</option>
+            <option value="50">50</option>
+            <option value="100">100</option>
+          </select>
+        </span>
+        <dir-pagination-controls max-size="5"></dir-pagination-controls>
+      </form>
+    </div>
+  </div>
 </div>
diff --git a/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html b/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html
index dda47adb1..4d739bedf 100644
--- a/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html
+++ b/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html
@@ -1,138 +1,148 @@
 <div class="datatable">
-  <rd-widget>
-    <rd-widget-body classes="no-padding">
-      <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
-        <div class="settings">
-          <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
-            <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table settings</span>
-            <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
-              <div class="tableMenu">
-                <div class="menuHeader"> Table settings </div>
-                <div class="menuContent">
-                  <div>
-                    <div class="md-checkbox">
-                      <input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
-                      <label for="setting_auto_refresh">Auto refresh</label>
-                    </div>
-                    <div ng-if="$ctrl.settings.repeater.autoRefresh">
-                      <label for="settings_refresh_rate"> Refresh rate </label>
-                      <select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
-                        <option value="10">10s</option>
-                        <option value="30">30s</option>
-                        <option value="60">1min</option>
-                        <option value="120">2min</option>
-                        <option value="300">5min</option>
-                      </select>
-                      <span>
-                        <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-top: 7px; display: none"></i>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-                <div>
-                  <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
-                </div>
-              </div>
-            </div>
-          </span>
-        </div>
+  <!-- toolbar header actions and settings -->
+  <div class="toolBar !flex-col gap-1">
+    <div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full">
+      <div class="toolBarTitle vertical-center">
+        <pr-icon icon="'database'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
+        Storage
       </div>
-      <div class="searchBar">
-        <i class="fa fa-search searchIcon" aria-hidden="true"></i>
+      <div class="searchBar vertical-center !mr-0">
+        <pr-icon icon="'search'" feather="true"></pr-icon>
         <input
           type="text"
           class="searchInput"
           ng-model="$ctrl.state.textFilter"
           ng-change="$ctrl.onTextFilterChange()"
-          placeholder="Search..."
+          placeholder="Search for storage..."
           auto-focus
           ng-model-options="{ debounce: 300 }"
         />
       </div>
-      <div class="table-responsive">
-        <table class="table table-hover nowrap-cells">
-          <thead>
-            <tr>
-              <th style="width: 20px">
-                <a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()">
-                  <i ng-class="{ 'fas fa-angle-down': $ctrl.state.expandAll, 'fas fa-angle-right': !$ctrl.state.expandAll }" aria-hidden="true"></i>
-                </a>
-              </th>
-              <th style="width: 60%">
-                <a ng-click="$ctrl.changeOrderBy('Name')">
-                  Storage
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th style="width: 38%">
-                <a ng-click="$ctrl.changeOrderBy('Size')">
-                  Usage
-                  <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Size' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Size' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
-              ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
-              ng-click="$ctrl.expandItem(item, !item.Expanded)"
-              pagination-id="$ctrl.tableKey"
-            >
-              <td>
-                <a ng-if="$ctrl.itemCanExpand(item)">
-                  <i ng-class="{ 'fas fa-angle-down': item.Expanded, 'fas fa-angle-right': !item.Expanded }" class="space-right" aria-hidden="true"></i>
-                </a>
-              </td>
-              <td>{{ item.Name }}</td>
-              <td>{{ item.Size }}</td>
-            </tr>
-            <tr
-              dir-paginate-end
-              ng-show="item.Expanded"
-              ng-repeat="vol in item.Volumes"
-              ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
-            >
-              <td></td>
-              <td>
-                <a ui-sref="kubernetes.volumes.volume({ name: vol.PersistentVolumeClaim.Name, namespace: vol.PersistentVolumeClaim.Namespace })">
-                  {{ vol.PersistentVolumeClaim.Name }}
-                </a>
-              </td>
-              <td>
-                {{ vol.PersistentVolumeClaim.Storage }}
-              </td>
-            </tr>
-            <tr ng-if="!$ctrl.dataset">
-              <td colspan="5" class="text-center text-muted">Loading...</td>
-            </tr>
-            <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="5" class="text-center text-muted">No storage available.</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div class="footer" ng-if="$ctrl.dataset">
-        <div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
-        <div class="paginationControls">
-          <form class="form-inline">
-            <span class="limitSelector">
-              <span style="margin-right: 5px"> Items per page </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
-                <option value="0">All</option>
-                <option value="10">10</option>
-                <option value="25">25</option>
-                <option value="50">50</option>
-                <option value="100">100</option>
-              </select>
-            </span>
-            <dir-pagination-controls max-size="5" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
-          </form>
+      <div class="settings">
+        <div class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
+          <span uib-dropdown-toggle aria-label="Settings">
+            <pr-icon icon="'more-vertical'" feather="true" class-name="'!mr-0 !h-4'"></pr-icon>
+          </span>
+          <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
+            <div class="tableMenu">
+              <div class="menuHeader"> Table settings </div>
+              <div class="menuContent">
+                <div>
+                  <div class="md-checkbox">
+                    <input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
+                    <label for="setting_auto_refresh">Auto refresh</label>
+                  </div>
+                  <div ng-if="$ctrl.settings.repeater.autoRefresh">
+                    <label for="settings_refresh_rate"> Refresh rate </label>
+                    <select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
+                      <option value="10">10s</option>
+                      <option value="30">30s</option>
+                      <option value="60">1min</option>
+                      <option value="120">2min</option>
+                      <option value="300">5min</option>
+                    </select>
+                    <span>
+                      <pr-icon id="refreshRateChange" icon="'check'" feather="true" mode="'success'" size="'sm'"></pr-icon>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div>
+                <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
-    </rd-widget-body>
-  </rd-widget>
+    </div>
+  </div>
+  <div class="table-responsive">
+    <table class="table table-hover nowrap-cells">
+      <thead>
+        <tr>
+          <th class="datatable-wide dropdown" ng-if="$ctrl.hasExpandableItems()">
+            <div class="cursor-pointer vertical-center" ng-click="$ctrl.expandAll()">
+              <pr-icon ng-if="$ctrl.state.expandAll" icon="'chevron-down'" feather="true"></pr-icon>
+              <pr-icon ng-if="!$ctrl.state.expandAll" icon="'chevron-right'" feather="true"></pr-icon>
+            </div>
+          </th>
+          <th style="width: 60%">
+            <table-column-header
+              col-title="'Storage'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'Name'"
+              is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('Name')"
+            ></table-column-header>
+          </th>
+          <th style="width: 38%">
+            <table-column-header
+              col-title="'Usage'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'Size'"
+              is-sorted-desc="$ctrl.state.orderBy === 'Size' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('Size')"
+            ></table-column-header>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
+          ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
+          ng-click="$ctrl.expandItem(item, !item.Expanded)"
+          pagination-id="$ctrl.tableKey"
+        >
+          <td ng-if="$ctrl.hasExpandableItems()">
+            <div ng-if="$ctrl.itemCanExpand(item)" class="vertical-center">
+              <pr-icon ng-if="item.Expanded" icon="'chevron-down'" feather="true"></pr-icon>
+              <pr-icon ng-if="!item.Expanded" icon="'chevron-right'" feather="true"></pr-icon>
+            </div>
+          </td>
+          <td>{{ item.Name }}</td>
+          <td>{{ item.Size }}</td>
+        </tr>
+        <tr
+          dir-paginate-end
+          ng-show="item.Expanded"
+          ng-repeat="vol in item.Volumes"
+          ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
+        >
+          <td></td>
+          <td>
+            <a ui-sref="kubernetes.volumes.volume({ name: vol.PersistentVolumeClaim.Name, namespace: vol.PersistentVolumeClaim.Namespace })">
+              {{ vol.PersistentVolumeClaim.Name }}
+            </a>
+          </td>
+          <td>
+            {{ vol.PersistentVolumeClaim.Storage }}
+          </td>
+        </tr>
+        <tr ng-if="!$ctrl.dataset">
+          <td colspan="5" class="text-center text-muted">Loading...</td>
+        </tr>
+        <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
+          <td colspan="5" class="text-center text-muted">No storage available.</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="footer pl-5" ng-if="$ctrl.dataset">
+    <div class="infoBar !ml-0" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
+    <div class="paginationControls">
+      <form class="form-inline">
+        <span class="limitSelector">
+          <span style="margin-right: 5px"> Items per page </span>
+          <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
+            <option value="0">All</option>
+            <option value="10">10</option>
+            <option value="25">25</option>
+            <option value="50">50</option>
+            <option value="100">100</option>
+          </select>
+        </span>
+        <dir-pagination-controls max-size="5" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
+      </form>
+    </div>
+  </div>
 </div>
diff --git a/app/kubernetes/views/volumes/volumes.html b/app/kubernetes/views/volumes/volumes.html
index 24d805958..adee5a659 100644
--- a/app/kubernetes/views/volumes/volumes.html
+++ b/app/kubernetes/views/volumes/volumes.html
@@ -9,7 +9,10 @@
         <rd-widget-body classes="no-padding">
           <uib-tabset active="ctrl.state.activeTab" justified="true" type="pills">
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
-              <uib-tab-heading> <i class="fa fa-database space-right" aria-hidden="true"></i> Volumes</uib-tab-heading>
+              <uib-tab-heading class="vertical-center">
+                <pr-icon icon="'database'" feather="true"></pr-icon>
+                Volumes
+              </uib-tab-heading>
               <kubernetes-volumes-datatable
                 dataset="ctrl.volumes"
                 table-key="kubernetes.volumes"
@@ -21,7 +24,10 @@
               </kubernetes-volumes-datatable>
             </uib-tab>
             <uib-tab index="1" classes="btn-sm" select="ctrl.selectTab(1)">
-              <uib-tab-heading> <i class="fa fa-hdd space-right" aria-hidden="true"></i> Storage</uib-tab-heading>
+              <uib-tab-heading class="vertical-center">
+                <pr-icon icon="'hard-drive'" feather="true"></pr-icon>
+                Storage
+              </uib-tab-heading>
               <kubernetes-volumes-storages-datatable dataset="ctrl.storages" table-key="kubernetes.volumes.storages" order-by="Name" refresh-callback="ctrl.getVolumes">
               </kubernetes-volumes-storages-datatable>
             </uib-tab>