diff --git a/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html b/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html
index 2399c36ee..d6aa0db70 100644
--- a/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html
+++ b/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html
@@ -1,4 +1,4 @@
-<div class="col-xs-12 form-section-title"> Secrets </div>
+<div class="col-xs-12 text-[13px] !px-0 !py-1"> Secrets </div>
 <table style="width: 50%">
   <tbody>
     <tr>
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index 9b34d1ac0..716a4c941 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -1,289 +1,330 @@
 <div class="datatable">
-  <rd-widget>
-    <rd-widget-body classes="no-padding">
-      <div ng-if="$ctrl.isPrimary" 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" data-cy="k8sApp-tableSettings">
-          <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" ng-if="$ctrl.isAdmin">
-                      <input id="applications_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
-                      <label for="applications_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()"
-                        data-cy="k8sApp-autoRefreshCheckbox"
-                      />
-                      <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"
-                        data-cy="k8sApp-refreshRateDropdown"
-                      >
-                        <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="k8sApp-tableSettingsCloseButton">Close</a>
-                </div>
-              </div>
-            </div>
-          </span>
-        </div>
+  <!-- toolbar header actions and settings -->
+  <div ng-if="$ctrl.isPrimary" 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="'box'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
+        Applications
       </div>
-      <div ng-if="$ctrl.isPrimary" class="actionBar">
-        <button
-          type="button"
-          class="btn btn-sm btn-danger"
-          ng-disabled="$ctrl.state.selectedItemCount === 0"
-          ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
-          data-cy="k8sApp-removeAppButton"
-        >
-          <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.applications.new" data-cy="k8sApp-addApplicationButton">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add application with form
-        </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="kubernetes.deploy" data-cy="k8sApp-deployFromManifestButton">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Create from manifest
-        </button>
-      </div>
-      <div ng-if="$ctrl.isPrimary" 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"
           ng-model="$ctrl.state.textFilter"
           ng-change="$ctrl.onTextFilterChange()"
-          placeholder="Search..."
+          placeholder="Search for an application..."
           auto-focus
           ng-model-options="{ debounce: 300 }"
           data-cy="k8sApp-searchApplicationsInput"
         />
       </div>
-      <div class="table-responsive">
-        <table class="table table-hover nowrap-cells" data-cy="k8sApp-appTable">
-          <thead ng-class="{ 'secondary-heading': !$ctrl.isPrimary }">
-            <tr>
-              <th class="datatable-wide">
-                <span ng-if="$ctrl.isPrimary">
-                  <span class="md-checkbox">
-                    <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" data-cy="k8sApp-selectAllCheckbox" />
-                    <label for="select_all"></label>
-                  </span>
-                  <a ng-click="$ctrl.expandAll()">
-                    <i ng-class="{ 'fas fa-angle-down': $ctrl.state.expandAll, 'fas fa-angle-right': !$ctrl.state.expandAll }" aria-hidden="true"></i>
-                  </a>
-                </span>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('Name')">
-                  Name
-                  <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>
-                <a ng-click="$ctrl.changeOrderBy('StackName')">
-                  Stack
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'StackName' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('ResourcePool')">
-                  Namespace
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourcePool' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourcePool' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('Image')">
-                  Image
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Image' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Image' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.filters.state.open">
-                <a ng-click="$ctrl.changeOrderBy('ApplicationType')">
-                  Application Type
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ApplicationType' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ApplicationType' && $ctrl.state.reverseOrder"></i>
-                </a>
+      <div class="actionBar !gap-3 !mr-0" ng-if="!$ctrl.offlineMode">
+        <button
+          ng-if="$ctrl.isPrimary"
+          type="button"
+          class="btn btn-sm btn-dangerlight h-fit vertical-center !ml-0"
+          ng-disabled="$ctrl.state.selectedItemCount === 0"
+          ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
+          data-cy="k8sApp-removeAppButton"
+        >
+          <pr-icon icon="'trash-2'" feather="true"></pr-icon>
+          Remove
+        </button>
+        <button
+          ng-if="$ctrl.isPrimary"
+          type="button"
+          class="btn btn-sm btn-secondary h-fit vertical-center !ml-0"
+          ui-sref="kubernetes.applications.new"
+          data-cy="k8sApp-addApplicationButton"
+        >
+          <pr-icon icon="'plus'" feather="true" class-name="'!h-3'"></pr-icon>Add with form
+        </button>
+        <button
+          ng-if="$ctrl.isPrimary"
+          type="button"
+          class="btn btn-sm btn-primary h-fit vertical-center !ml-0"
+          ui-sref="kubernetes.deploy"
+          data-cy="k8sApp-deployFromManifestButton"
+        >
+          <pr-icon icon="'plus'" feather="true" class-name="'!h-3'"></pr-icon>Create from manifest
+        </button>
+      </div>
+      <div class="settings" data-cy="k8sApp-tableSettings">
+        <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 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>
-                  <span uib-dropdown-toggle class="table-filter" ng-if="!$ctrl.filters.state.enabled">Filter <i class="fa fa-filter" aria-hidden="true"></i></span>
-                  <span uib-dropdown-toggle class="table-filter filter-active" ng-if="$ctrl.filters.state.enabled">Filter <i class="fa fa-check" aria-hidden="true"></i></span>
-                </div>
-                <div class="dropdown-menu" uib-dropdown-menu>
-                  <div class="tableMenu">
-                    <div class="menuHeader"> Filter by application type </div>
-                    <div class="menuContent">
-                      <div class="md-checkbox" ng-repeat="filter in $ctrl.filters.state.values track by $index">
-                        <input id="filter_state_{{ $index }}" type="checkbox" ng-model="filter.display" ng-change="$ctrl.onStateFilterChange()" />
-                        <label for="filter_state_{{ $index }}">{{ filter.type | kubernetesApplicationTypeText }}</label>
-                      </div>
-                    </div>
-                    <div>
-                      <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.filters.state.open = false;">Close</a>
-                    </div>
+                  <div class="md-checkbox" ng-if="$ctrl.isAdmin">
+                    <input id="applications_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
+                    <label for="applications_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()"
+                      data-cy="k8sApp-autoRefreshCheckbox"
+                    />
+                    <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"
+                      data-cy="k8sApp-refreshRateDropdown"
+                    >
+                      <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>
-              </th>
-              <th> Status </th>
-              <th> Published </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('CreationDate')">
-                  Created
-                  <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'CreationDate' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'CreationDate' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              ng-click="$ctrl.expandItem(item, !$ctrl.isItemExpanded(item))"
-              dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset  | filter:$ctrl.applyFilters | filter:$ctrl.state.textFilter | filter:$ctrl.isDisplayed | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
-              ng-class="{ active: item.Checked, interactive: $ctrl.isExpandable(item), 'secondary-body': !$ctrl.isPrimary }"
-              pagination-id="$ctrl.tableKey"
-            >
-              <td>
-                <span ng-if="$ctrl.isPrimary" class="md-checkbox">
-                  <input
-                    id="select_{{ $index }}"
-                    type="checkbox"
-                    ng-model="item.Checked"
-                    ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation()"
-                    ng-disabled="$ctrl.isSystemNamespace(item)"
-                  />
-                  <label for="select_{{ $index }}"></label>
-                </span>
-                <a ng-if="$ctrl.isExpandable(item)">
-                  <i ng-class="{ 'fas fa-angle-down': $ctrl.isItemExpanded(item), 'fas fa-angle-right': !$ctrl.isItemExpanded(item) }" class="space-right" aria-hidden="true"></i>
-                </a>
-              </td>
-              <td>
-                <a ng-if="item.KubernetesApplications" ui-sref="kubernetes.helm({ name: item.Name, namespace: item.ResourcePool })" ng-click="$event.stopPropagation()"
-                  >{{ item.Name }}
-                </a>
-                <a
-                  ng-if="!item.KubernetesApplications"
-                  ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool })"
-                  ng-click="$event.stopPropagation()"
-                  >{{ item.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.isExternalApplication(item)">external</span>
-              </td>
-              <td>{{ item.StackName || '-' }}</td>
-              <td>
-                <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool })" ng-click="$event.stopPropagation()">{{ item.ResourcePool }}</a>
-              </td>
-              <td title="{{ item.Image }}"
-                >{{ item.Image | truncate: 64 }} <span ng-if="item.Containers.length > 1">+ {{ item.Containers.length - 1 }}</span></td
-              >
-              <td>{{ item.ApplicationType | kubernetesApplicationTypeText }}</td>
-              <td ng-if="item.ApplicationType !== $ctrl.KubernetesApplicationTypes.POD">
-                <status-indicator ok="(item.TotalPodsCount > 0 && item.TotalPodsCount === item.RunningPodsCount) || item.Status === 'Ready'"></status-indicator>
-                <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
-                <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
-                <span ng-if="item.RunningPodsCount >= 0 && item.TotalPodsCount >= 0">
-                  <code>{{ item.RunningPodsCount }}</code> / <code>{{ item.TotalPodsCount }}</code>
-                </span>
-                <span ng-if="item.KubernetesApplications">{{ item.Status }}</span>
-              </td>
-              <td ng-if="item.ApplicationType === $ctrl.KubernetesApplicationTypes.POD">
-                {{ item.Pods[0].Status }}
-              </td>
-              <td>
-                <span>
-                  {{ item.Services.length === 0 ? 'No' : 'Yes' }}
-                </span>
-              </td>
-              <td>{{ item.CreationDate | getisodate }} {{ item.ApplicationOwner ? 'by ' + item.ApplicationOwner : '' }}</td>
-            </tr>
-            <tr dir-paginate-end ng-show="$ctrl.isExpandable(item) && $ctrl.isItemExpanded(item)" ng-class="{ 'secondary-body': $ctrl.isPrimary && !item.KubernetesApplications }">
-              <td></td>
-              <td colspan="8" class="datatable-padding-vertical">
-                <span ng-if="item.KubernetesApplications">
-                  <kubernetes-applications-datatable
-                    dataset="item.KubernetesApplications"
-                    table-key="{{ item.Id }}_table"
-                    settings-key="{{ $ctrl.tableKey }}"
-                    order-by="Name"
-                    remove-action="$ctrl.removeAction"
-                    refresh-callback="$ctrl.refreshCallback"
-                    on-publishing-mode-click="($ctrl.onPublishingModeClick)"
-                    is-primary="false"
-                  >
-                  </kubernetes-applications-datatable>
-                </span>
-                <span ng-if="!item.KubernetesApplications">
-                  <kubernetes-applications-datatable-url
-                    ng-if="$ctrl.getPublishedUrl(item)"
-                    published-url="{{ $ctrl.getPublishedUrl(item) }}"
-                  ></kubernetes-applications-datatable-url>
-                  <kubernetes-applications-datatable-details
-                    ng-if="$ctrl.hasConfigurationSecrets(item)"
-                    configurations="item.Configurations"
-                  ></kubernetes-applications-datatable-details>
-                </span>
-              </td>
-            </tr>
-            <tr ng-if="!$ctrl.dataset">
-              <td colspan="8" class="text-center text-muted">Loading...</td>
-            </tr>
-            <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="8" class="text-center text-muted">No application available.</td>
-            </tr>
-          </tbody>
-        </table>
+              </div>
+              <div>
+                <a type="button" class="btn btn-sm btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8sApp-tableSettingsCloseButton">Close</a>
+              </div>
+            </div>
+          </div>
+        </span>
       </div>
-      <div ng-if="$ctrl.isPrimary" 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>
+    <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>
+    </div>
+  </div>
+  <!-- data table content -->
+  <div class="table-responsive">
+    <table class="table table-hover table-filters nowrap-cells" data-cy="k8sApp-appTable">
+      <thead ng-class="{ 'secondary-heading': !$ctrl.isPrimary }">
+        <tr role="row">
+          <th role="columnheader" class="datatable-wide dropdown">
+            <div ng-if="$ctrl.isPrimary" class="flex no-wrap min-w-max">
+              <span class="md-checkbox vertical-center">
+                <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" data-cy="k8sApp-selectAllCheckbox" />
+                <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>
+              </div>
+            </div>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Name'"
+              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>
+            <table-column-header
+              col-title="'Stack'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'StackName'"
+              is-sorted-desc="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('StackName')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Namespace'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'ResourcePool'"
+              is-sorted-desc="$ctrl.state.orderBy === 'ResourcePool' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('ResourcePool')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Image'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'Image'"
+              is-sorted-desc="$ctrl.state.orderBy === 'Image' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('Image')"
+            ></table-column-header>
+          </th>
+          <th uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.filters.state.open">
+            <div class="flex flex-row no-wrap gap-2">
+              <table-column-header
+                col-title="'Application Type'"
+                can-sort="true"
+                is-sorted="$ctrl.state.orderBy === 'ApplicationType'"
+                is-sorted-desc="$ctrl.state.orderBy === 'ApplicationType' && $ctrl.state.reverseOrder"
+                ng-click="$ctrl.changeOrderBy('ApplicationType')"
+              ></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>
+              </div>
+              <div class="dropdown-menu" uib-dropdown-menu>
+                <div class="tableMenu">
+                  <div class="menuHeader"> Filter by application type </div>
+                  <div class="menuContent">
+                    <div class="md-checkbox" ng-repeat="filter in $ctrl.filters.state.values track by $index">
+                      <input id="filter_state_{{ $index }}" type="checkbox" ng-model="filter.display" ng-change="$ctrl.onStateFilterChange()" />
+                      <label for="filter_state_{{ $index }}">{{ filter.type | kubernetesApplicationTypeText }}</label>
+                    </div>
+                  </div>
+                  <div>
+                    <a type="button" class="btn btn-sm btn-default btn-sm" ng-click="$ctrl.filters.state.open = false;">Close</a>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </th>
+          <th>
+            <table-column-header col-title="'Status'" can-sort="false"></table-column-header>
+            <!-- Status -->
+          </th>
+          <th>
+            <table-column-header col-title="'Published'" can-sort="false"></table-column-header>
+            <!-- Published -->
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Created'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'CreationDate'"
+              is-sorted-desc="$ctrl.state.orderBy === 'CreationDate' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('CreationDate')"
+            ></table-column-header>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          ng-click="$ctrl.expandItem(item, !$ctrl.isItemExpanded(item))"
+          dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.applyFilters | filter:$ctrl.state.textFilter | filter:$ctrl.isDisplayed | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
+          ng-class="{ active: item.Checked, interactive: $ctrl.isExpandable(item), 'secondary-body': !$ctrl.isPrimary }"
+          pagination-id="$ctrl.tableKey"
+        >
+          <td class="h-[50px]">
+            <span ng-if="$ctrl.isPrimary" class="md-checkbox vertical-center">
+              <input
+                id="select_{{ $index }}"
+                type="checkbox"
+                ng-model="item.Checked"
+                ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation()"
+                ng-disabled="$ctrl.isSystemNamespace(item)"
+              />
+              <label for="select_{{ $index }}"></label>
             </span>
-            <dir-pagination-controls max-size="5" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
-          </form>
-        </div>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
+            <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>
+            </div>
+          </td>
+          <td>
+            <a ng-if="item.KubernetesApplications" ui-sref="kubernetes.helm({ name: item.Name, namespace: item.ResourcePool })" ng-click="$event.stopPropagation()"
+              >{{ item.Name }}
+            </a>
+            <a
+              ng-if="!item.KubernetesApplications"
+              ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool })"
+              ng-click="$event.stopPropagation()"
+              >{{ item.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.isExternalApplication(item)">external</span>
+          </td>
+          <td>{{ item.StackName || '-' }}</td>
+          <td>
+            <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool })" ng-click="$event.stopPropagation()">{{ item.ResourcePool }}</a>
+          </td>
+          <td title="{{ item.Image }}"
+            >{{ item.Image | truncate: 64 }} <span ng-if="item.Containers.length > 1">+ {{ item.Containers.length - 1 }}</span></td
+          >
+          <td>{{ item.ApplicationType | kubernetesApplicationTypeText }}</td>
+          <td ng-if="item.ApplicationType !== $ctrl.KubernetesApplicationTypes.POD">
+            <status-indicator ok="(item.TotalPodsCount > 0 && item.TotalPodsCount === item.RunningPodsCount) || item.Status === 'Ready'"></status-indicator>
+            <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
+            <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
+            <span ng-if="item.RunningPodsCount >= 0 && item.TotalPodsCount >= 0"
+              ><code>{{ item.RunningPodsCount }}</code> / <code>{{ item.TotalPodsCount }}</code></span
+            >
+            <span ng-if="item.KubernetesApplications">{{ item.Status }}</span>
+          </td>
+          <td ng-if="item.ApplicationType === $ctrl.KubernetesApplicationTypes.POD">
+            {{ item.Pods[0].Status }}
+          </td>
+          <td>
+            <span>
+              {{ item.Services.length === 0 ? 'No' : 'Yes' }}
+            </span>
+          </td>
+          <td>{{ item.CreationDate | getisodate }} {{ item.ApplicationOwner ? 'by ' + item.ApplicationOwner : '' }}</td>
+        </tr>
+        <tr dir-paginate-end ng-show="$ctrl.isExpandable(item) && $ctrl.isItemExpanded(item)" ng-class="{ 'secondary-body': $ctrl.isPrimary && !item.KubernetesApplications }">
+          <td></td>
+          <td colspan="8" class="datatable-padding-vertical">
+            <span ng-if="item.KubernetesApplications">
+              <kubernetes-applications-datatable
+                dataset="item.KubernetesApplications"
+                table-key="{{ item.Id }}_table"
+                settings-key="{{ $ctrl.tableKey }}"
+                order-by="Name"
+                remove-action="$ctrl.removeAction"
+                refresh-callback="$ctrl.refreshCallback"
+                on-publishing-mode-click="($ctrl.onPublishingModeClick)"
+                is-primary="false"
+              >
+              </kubernetes-applications-datatable>
+            </span>
+            <span ng-if="!item.KubernetesApplications">
+              <kubernetes-applications-datatable-url ng-if="$ctrl.getPublishedUrl(item)" published-url="{{ $ctrl.getPublishedUrl(item) }}"></kubernetes-applications-datatable-url>
+              <kubernetes-applications-datatable-details
+                ng-if="$ctrl.hasConfigurationSecrets(item)"
+                configurations="item.Configurations"
+              ></kubernetes-applications-datatable-details>
+            </span>
+          </td>
+        </tr>
+        <tr ng-if="!$ctrl.dataset">
+          <td colspan="8" class="text-center text-muted">Loading...</td>
+        </tr>
+        <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
+          <td colspan="8" class="text-center text-muted">No application available.</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div ng-if="$ctrl.isPrimary" 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 class="mr-1"> 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/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
index 8030c07f3..04a58f294 100644
--- a/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
@@ -1,250 +1,280 @@
 <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">
-            <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="ports_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
-                      <label for="ports_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;">Close</a>
-                </div>
-              </div>
-            </div>
-          </span>
-        </div>
+  <!-- table title and action menu -->
+  <div class="toolBar !flex-col gap-1">
+    <div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full">
+      <!-- title -->
+      <div class="toolBarTitle vertical-center">
+        <pr-icon icon="'repeat'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
+        Port mappings
       </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" class-name="'icon !h-3'"></pr-icon>
         <input
           type="text"
           class="searchInput"
           ng-model="$ctrl.state.textFilter"
           ng-change="$ctrl.onTextFilterChange()"
-          placeholder="Search..."
+          placeholder="Search for a port mapping..."
           auto-focus
           ng-model-options="{ debounce: 300 }"
         />
       </div>
-      <div class="table-responsive">
-        <table class="table table-hover nowrap-cells">
-          <thead>
-            <tr>
-              <th>
-                <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>
-                <a ng-click="$ctrl.changeOrderBy('Name')">
-                  Application
-                  <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> Publishing mode </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('TargetPort')">
-                  Exposed port
-                  <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'TargetPort' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'TargetPort' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('Port')">
-                  Container port
-                  <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Port' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Port' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th> HTTP route </th>
-            </tr>
-          </thead>
-          <tbody>
-            <!-- main rows -->
-            <!-- dir-paginate-start track by $index -->
-            <tr
-              dir-paginate-start="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: $ctrl.tableKey))"
-              ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
-              ng-click="$ctrl.expandItem(item, !item.Expanded)"
-              pagination-id="$ctrl.tableKey"
-            >
-              <!-- expandable -->
-              <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>
-              <!-- Application -->
-              <td>
-                <a ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool })">{{ item.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.isExternalApplication(item)">external</span>
-              </td>
-              <!-- Publishing mode -->
-              <td>
-                <!-- LB -->
-                <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.LOAD_BALANCER">
-                  <span> <i class="fa fa-project-diagram" aria-hidden="true" style="margin-right: 2px"></i> LoadBalancer </span>
-                  <span class="text-muted small" style="margin-left: 5px">
-                    <span ng-if="item.LoadBalancerIPAddress">{{ item.LoadBalancerIPAddress }}</span>
-                    <span ng-if="!item.LoadBalancerIPAddress">pending</span>
-                  </span>
-                </span>
-                <!-- Internal -->
-                <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.CLUSTER_IP">
-                  <i class="fa fa-list-alt" aria-hidden="true" style="margin-right: 2px"></i> ClusterIP
-                </span>
-                <!-- Cluster -->
-                <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.NODE_PORT"> <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px"></i> NodePort </span>
-              </td>
-              <!-- Exposed port -->
-              <td>
-                <span ng-if="!$ctrl.itemCanExpand(item)">
-                  {{ item.Ports[0].Port }}
-                  <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ item.Ports[0].Port }}" target="_blank" style="margin-left: 5px">
-                    <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
-                  </a>
-                </span>
-              </td>
-              <!-- Container port -->
-              <td>
-                <span ng-if="!$ctrl.itemCanExpand(item)"> {{ item.Ports[0].TargetPort }}/{{ item.Ports[0].Protocol }} </span>
-              </td>
-              <!-- HTTP route -->
-              <td>
-                <span ng-if="!$ctrl.itemCanExpand(item)">
-                  <span ng-if="!$ctrl.portHasIngressRules(item.Ports[0])">-</span>
-                  <span ng-if="$ctrl.portHasIngressRules(item.Ports[0])">
-                    <span
-                      ng-if="!$ctrl.ruleCanBeDisplayed(item.Ports[0].IngressRules[0])"
-                      class="text-muted"
-                      tooltip-append-to-body="true"
-                      tooltip-placement="bottom"
-                      tooltip-class="portainer-tooltip"
-                      uib-tooltip="Ingress controller IP address not available yet"
-                      style="cursor: pointer"
-                      >pending
+      <!-- actions -->
+      <div data-cy="k8sApp-tableSettings" 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 aria-label="Settings">
+            <pr-icon icon="'more-vertical'" feather="true" class-name="'icon !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="applications_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
+                    <label for="applications_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()"
+                      data-cy="k8sApp-autoRefreshCheckbox"
+                    />
+                    <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"
+                      data-cy="k8sApp-refreshRateDropdown"
+                    >
+                      <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>
-                    <span ng-if="$ctrl.ruleCanBeDisplayed(item.Ports[0].IngressRules[0])">
-                      <a ng-href="{{ $ctrl.buildIngressRuleURL(item.Ports[0].IngressRules[0]) }}" target="_blank">
-                        {{ $ctrl.buildIngressRuleURL(item.Ports[0].IngressRules[0]) | stripprotocol }}
-                      </a>
-                    </span>
-                  </span>
-                </span>
-              </td>
-            </tr>
-            <!-- sub rows -->
-            <tr ng-show="item.Expanded" ng-repeat-start="port in item.Ports" ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }">
-              <td ng-if="!$ctrl.portHasIngressRules(port)"></td>
-              <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
-              <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
-              <td ng-if="!$ctrl.portHasIngressRules(port)">
-                {{ port.Port }}
-                <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" style="margin-left: 5px">
-                  <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
-                </a>
-              </td>
-              <td ng-if="!$ctrl.portHasIngressRules(port)">{{ port.TargetPort }}/{{ port.Protocol }}</td>
-              <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
-            </tr>
-            <tr
-              ng-show="item.Expanded"
-              ng-repeat-end
-              ng-repeat="rule in port.IngressRules"
-              ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
-            >
-              <td></td>
-              <td>-</td>
-              <td>-</td>
-              <td>
-                {{ port.Port }}
-                <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" style="margin-left: 5px">
-                  <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
-                </a>
-              </td>
-              <td>{{ port.TargetPort }}/{{ port.Protocol }}</td>
-              <td>
+                  </div>
+                </div>
+              </div>
+              <div>
+                <a type="button" class="btn btn-sm btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8sApp-tableSettingsCloseButton">Close</a>
+              </div>
+            </div>
+          </div>
+        </span>
+      </div>
+    </div>
+    <!-- info text -->
+    <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>
+    </div>
+  </div>
+  <!-- table -->
+  <div class="table-responsive">
+    <table class="table table-hover nowrap-cells">
+      <thead>
+        <tr>
+          <th>
+            <div class="cursor-pointer vertical-center" ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()" class="flex no-wrap min-w-max">
+              <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>
+            </div>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Application'"
+              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>
+            <table-column-header col-title="'Publishing mode'" can-sort="false"></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Exposed port'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'TargetPort'"
+              is-sorted-desc="$ctrl.state.orderBy === 'TargetPort' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('TargetPort')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Container port'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'Port'"
+              is-sorted-desc="$ctrl.state.orderBy === 'Port' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('Port')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header col-title="'HTTP route'" can-sort="false"></table-column-header>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <!-- main rows -->
+        <!-- dir-paginate-start track by $index -->
+        <tr
+          dir-paginate-start="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: $ctrl.tableKey))"
+          ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
+          ng-click="$ctrl.expandItem(item, !item.Expanded)"
+          pagination-id="$ctrl.tableKey"
+        >
+          <!-- expandable -->
+          <td>
+            <div ng-if="$ctrl.itemCanExpand(item)">
+              <pr-icon ng-if="item.Expanded" icon="'chevron-down'" feather="true" class-name="'icon'"></pr-icon>
+              <pr-icon ng-if="!item.Expanded" icon="'chevron-right'" feather="true" class-name="'icon'"></pr-icon>
+            </div>
+          </td>
+          <!-- Application -->
+          <td>
+            <a ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool })">{{ item.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.isExternalApplication(item)">external</span>
+          </td>
+          <!-- Publishing mode -->
+          <td>
+            <!-- LB -->
+            <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.LOAD_BALANCER">
+              <span><pr-icon icon="'share-2'" feather="true" class-name="'icon'"></pr-icon> LoadBalancer </span>
+              <span class="text-muted small ml-5">
+                <span ng-if="item.LoadBalancerIPAddress">{{ item.LoadBalancerIPAddress }}</span>
+                <span ng-if="!item.LoadBalancerIPAddress">pending</span>
+              </span>
+            </span>
+            <!-- Internal -->
+            <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.CLUSTER_IP"> <i class="fa fa-list-alt mr-0.5" aria-hidden="true"></i> ClusterIP </span>
+            <!-- Cluster -->
+            <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.NODE_PORT"> <pr-icon icon="'list'" feather="true" class-name="'icon'"></pr-icon> NodePort </span>
+          </td>
+          <!-- Exposed port -->
+          <td>
+            <span ng-if="!$ctrl.itemCanExpand(item)">
+              {{ item.Ports[0].Port }}
+              <a class="vertical-center" ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ item.Ports[0].Port }}" target="_blank" class="ml-1">
+                <pr-icon icon="'external-link'" feather="true" class-name="'icon'"></pr-icon> access
+              </a>
+            </span>
+          </td>
+          <!-- Container port -->
+          <td>
+            <span ng-if="!$ctrl.itemCanExpand(item)"> {{ item.Ports[0].TargetPort }}/{{ item.Ports[0].Protocol }} </span>
+          </td>
+          <!-- HTTP route -->
+          <td>
+            <span ng-if="!$ctrl.itemCanExpand(item)">
+              <span ng-if="!$ctrl.portHasIngressRules(item.Ports[0])">-</span>
+              <span ng-if="$ctrl.portHasIngressRules(item.Ports[0])">
                 <span
-                  ng-if="!$ctrl.ruleCanBeDisplayed(rule)"
-                  class="text-muted"
+                  ng-if="!$ctrl.ruleCanBeDisplayed(item.Ports[0].IngressRules[0])"
+                  class="text-muted cursor-pointer"
                   tooltip-append-to-body="true"
                   tooltip-placement="bottom"
                   tooltip-class="portainer-tooltip"
                   uib-tooltip="Ingress controller IP address not available yet"
-                  style="cursor: pointer"
                   >pending
                 </span>
-                <span ng-if="$ctrl.ruleCanBeDisplayed(rule)">
-                  <a ng-href="{{ $ctrl.buildIngressRuleURL(rule) }}" target="_blank">
-                    {{ $ctrl.buildIngressRuleURL(rule) | stripprotocol }}
+                <span ng-if="$ctrl.ruleCanBeDisplayed(item.Ports[0].IngressRules[0])">
+                  <a ng-href="{{ $ctrl.buildIngressRuleURL(item.Ports[0].IngressRules[0]) }}" target="_blank">
+                    {{ $ctrl.buildIngressRuleURL(item.Ports[0].IngressRules[0]) | stripprotocol }}
                   </a>
                 </span>
-              </td>
-            </tr>
-            <tr dir-paginate-end></tr>
-            <!-- no dataset -->
-            <tr ng-if="!$ctrl.dataset">
-              <td colspan="6" class="text-center text-muted">Loading...</td>
-            </tr>
-            <!-- no values in filtered dataset -->
-            <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="6" class="text-center text-muted">No application port mapping 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>
             </span>
-            <dir-pagination-controls max-size="5" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
-          </form>
-        </div>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
+          </td>
+        </tr>
+        <!-- sub rows -->
+        <tr ng-show="item.Expanded" ng-repeat-start="port in item.Ports" ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }">
+          <td ng-if="!$ctrl.portHasIngressRules(port)"></td>
+          <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
+          <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
+          <td ng-if="!$ctrl.portHasIngressRules(port)">
+            {{ port.Port }}
+            <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" class="ml-1">
+              <pr-icon icon="'external-link'" feather="true"></pr-icon> access
+            </a>
+          </td>
+          <td ng-if="!$ctrl.portHasIngressRules(port)">{{ port.TargetPort }}/{{ port.Protocol }}</td>
+          <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
+        </tr>
+        <tr
+          ng-show="item.Expanded"
+          ng-repeat-end
+          ng-repeat="rule in port.IngressRules"
+          ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
+        >
+          <td></td>
+          <td>-</td>
+          <td>-</td>
+          <td>
+            {{ port.Port }}
+            <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" class="ml-1">
+              <pr-icon icon="'external-link'" feather="true"></pr-icon>access
+            </a>
+          </td>
+          <td>{{ port.TargetPort }}/{{ port.Protocol }}</td>
+          <td>
+            <span
+              ng-if="!$ctrl.ruleCanBeDisplayed(rule)"
+              class="text-muted cursor-pointer"
+              tooltip-append-to-body="true"
+              tooltip-placement="bottom"
+              tooltip-class="portainer-tooltip"
+              uib-tooltip="Ingress controller IP address not available yet"
+              >pending
+            </span>
+            <span ng-if="$ctrl.ruleCanBeDisplayed(rule)">
+              <a ng-href="{{ $ctrl.buildIngressRuleURL(rule) }}" target="_blank">
+                {{ $ctrl.buildIngressRuleURL(rule) | stripprotocol }}
+              </a>
+            </span>
+          </td>
+        </tr>
+        <tr class="!h-0" dir-paginate-end></tr>
+        <!-- no dataset -->
+        <tr ng-if="!$ctrl.dataset">
+          <td colspan="6" class="text-center text-muted">Loading...</td>
+        </tr>
+        <!-- no values in filtered dataset -->
+        <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
+          <td colspan="6" class="text-center text-muted">No application port mapping 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 class="mr-1"> 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/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
index 978ff6739..ebc93c5eb 100644
--- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
+++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
@@ -1,31 +1,69 @@
 <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">
+  <!-- table title and action menu -->
+  <div class="toolBar !flex-col gap-1">
+    <div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full">
+      <!-- title -->
+      <div class="toolBarTitle vertical-center">
+        <pr-icon icon="'list'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
+        Stacks
+      </div>
+      <!-- actions -->
+      <div class="searchBar vertical-center">
+        <pr-icon icon="'search'" feather="true" class-name="'!h-3'"></pr-icon>
+        <input
+          type="text"
+          class="searchInput min-w-min self-start"
+          ng-model="$ctrl.state.textFilter"
+          ng-change="$ctrl.onTextFilterChange()"
+          placeholder="Search for a stack..."
+          auto-focus
+          ng-model-options="{ debounce: 300 }"
+        />
+      </div>
+      <div class="actionBar !gap-3 !mr-0">
+        <button
+          type="button"
+          class="btn btn-sm btn-dangerlight h-fit vertical-center !ml-0"
+          ng-disabled="$ctrl.state.selectedItemCount === 0"
+          ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
+          data-cy="k8sApp-removeAppButton"
+        >
+          <pr-icon icon="'trash-2'" feather="true"></pr-icon>
+          Remove
+        </button>
+        <div class="settings" data-cy="k8sApp-tableSettings">
           <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>
+            <span uib-dropdown-toggle>
+              <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="stacks_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
-                      <label for="stacks_setting_show_system">Show system resources</label>
+                      <input id="applications_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
+                      <label for="applications_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()" />
+                      <input
+                        id="setting_auto_refresh"
+                        type="checkbox"
+                        ng-model="$ctrl.settings.repeater.autoRefresh"
+                        ng-change="$ctrl.onSettingsRepeaterChange()"
+                        data-cy="k8sApp-autoRefreshCheckbox"
+                      />
                       <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">
+                      <select
+                        id="settings_refresh_rate"
+                        ng-model="$ctrl.settings.repeater.refreshRate"
+                        ng-change="$ctrl.onSettingsRepeaterChange()"
+                        class="small-select"
+                        data-cy="k8sApp-refreshRateDropdown"
+                      >
                         <option value="10">10s</option>
                         <option value="30">30s</option>
                         <option value="60">1min</option>
@@ -33,148 +71,155 @@
                         <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>
+                        <i id="refreshRateChange" class="fa fa-check green-icon mt-2" aria-hidden="true"></i>
                       </span>
                     </div>
                   </div>
                 </div>
                 <div>
-                  <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
+                  <a type="button" class="btn btn-sm btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8sApp-tableSettingsCloseButton">Close</a>
                 </div>
               </div>
             </div>
           </span>
         </div>
       </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>
-      </div>
-      <div class="searchBar">
-        <i class="fa fa-search searchIcon" aria-hidden="true"></i>
-        <input
-          type="text"
-          class="searchInput"
-          ng-model="$ctrl.state.textFilter"
-          ng-change="$ctrl.onTextFilterChange()"
-          placeholder="Search..."
-          auto-focus
-          ng-model-options="{ debounce: 300 }"
-        />
-      </div>
-      <div class="table-responsive">
-        <table class="table table-hover nowrap-cells">
-          <thead>
-            <tr>
-              <th style="width: 55px">
-                <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.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>
-                <a ng-click="$ctrl.changeOrderBy('Name')">
-                  Stack
-                  <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>
-                <a ng-click="$ctrl.changeOrderBy('ResourcePool')">
-                  Namespace
-                  <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourcePool' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ResourcePool' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th>
-                <a ng-click="$ctrl.changeOrderBy('Applications.length')">
-                  Applications
-                  <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Applications.length' && !$ctrl.state.reverseOrder"></i>
-                  <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Applications.length' && $ctrl.state.reverseOrder"></i>
-                </a>
-              </th>
-              <th> Actions </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              dir-paginate-start="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: $ctrl.tableKey))"
-              ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
-              ng-click="$ctrl.expandItem(item, !item.Expanded)"
-              pagination-id="$ctrl.tableKey"
+    </div>
+    <!-- info text -->
+    <div class="flex flex-row">
+      <span class="small text-muted mt-1" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+        <pr-icon icon="'info'" feather="true"></pr-icon>
+        System resources are hidden, this can be changed in the table settings.
+      </span>
+    </div>
+  </div>
+  <div class="table-responsive">
+    <table class="table table-hover nowrap-cells">
+      <thead>
+        <tr>
+          <th class="w-20 dropdown">
+            <div class="flex no-wrap h-full items-center">
+              <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>
+              <div class="cursor-pointer" ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()">
+                <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>
+          <th>
+            <table-column-header
+              col-title="'Stack'"
+              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>
+            <table-column-header
+              col-title="'Namespace'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'ResourcePool'"
+              is-sorted-desc="$ctrl.state.orderBy === 'ResourcePool' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('ResourcePool')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header
+              col-title="'Applications'"
+              can-sort="true"
+              is-sorted="$ctrl.state.orderBy === 'Applications.length'"
+              is-sorted-desc="$ctrl.state.orderBy === 'Applications.length' && $ctrl.state.reverseOrder"
+              ng-click="$ctrl.changeOrderBy('Applications.length')"
+            ></table-column-header>
+          </th>
+          <th>
+            <table-column-header col-title="'Actions'" can-sort="false"></table-column-header>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          dir-paginate-start="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: $ctrl.tableKey))"
+          ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
+          ng-click="$ctrl.expandItem(item, !item.Expanded)"
+          pagination-id="$ctrl.tableKey"
+        >
+          <td>
+            <div class="flex no-wrap items-center">
+              <span class="md-checkbox">
+                <input
+                  id="select_{{ $index }}"
+                  type="checkbox"
+                  ng-model="item.Checked"
+                  ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation();"
+                  ng-disabled="!$ctrl.allowSelection(item)"
+                />
+                <label for="select_{{ $index }}"></label>
+              </span>
+              <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>
+            </div>
+          </td>
+          <td>
+            {{ item.Name }}
+          </td>
+          <td>
+            <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool })" ng-click="$event.stopPropagation();">{{ item.ResourcePool }}</a>
+            <span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemNamespace(item.ResourcePool)">system</span>
+          </td>
+          <td>{{ item.Applications.length }}</td>
+          <td>
+            <a class="vertical-center" ui-sref="kubernetes.stacks.stack.logs({ namespace: item.ResourcePool, name: item.Name })">
+              <pr-icon icon="'file-text'" size="'md'" title="Logs" feather="true"></pr-icon>
+              Logs
+            </a>
+          </td>
+        </tr>
+        <tr
+          dir-paginate-end
+          ng-show="item.Expanded"
+          ng-repeat="app in item.Applications"
+          ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
+        >
+          <td></td>
+          <td colspan="4">
+            <a ui-sref="kubernetes.applications.application({ name: app.Name, namespace: app.ResourcePool })">{{ app.Name }}</a>
+            <span style="margin-left: 5px" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(app.ResourcePool) && $ctrl.isExternalApplication(app)"
+              >external</span
             >
-              <td>
-                <span class="md-checkbox">
-                  <input
-                    id="select_{{ $index }}"
-                    type="checkbox"
-                    ng-model="item.Checked"
-                    ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation();"
-                    ng-disabled="!$ctrl.allowSelection(item)"
-                  />
-                  <label for="select_{{ $index }}"></label>
-                </span>
-                <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>
-                <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool })" ng-click="$event.stopPropagation();">{{ item.ResourcePool }}</a>
-                <span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemNamespace(item.ResourcePool)">system</span>
-              </td>
-              <td>{{ item.Applications.length }}</td>
-              <td>
-                <a ui-sref="kubernetes.stacks.stack.logs({ namespace: item.ResourcePool, name: item.Name })"> <i class="fa fa-file-alt" aria-hidden="true"></i> Logs </a>
-              </td>
-            </tr>
-            <tr
-              dir-paginate-end
-              ng-show="item.Expanded"
-              ng-repeat="app in item.Applications"
-              ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
-            >
-              <td></td>
-              <td colspan="4">
-                <a ui-sref="kubernetes.applications.application({ name: app.Name, namespace: app.ResourcePool })">{{ app.Name }}</a>
-                <span style="margin-left: 5px" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(app.ResourcePool) && $ctrl.isExternalApplication(app)"
-                  >external</span
-                >
-              </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 stack 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>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
+          </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 stack 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/applications/applications.html b/app/kubernetes/views/applications/applications.html
index 8e004901b..6de8af11f 100644
--- a/app/kubernetes/views/applications/applications.html
+++ b/app/kubernetes/views/applications/applications.html
@@ -9,7 +9,7 @@
         <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-laptop-code space-right" aria-hidden="true"></i> Applications </uib-tab-heading>
+              <uib-tab-heading class="vertical-center"> <pr-icon icon="'box'" feather="true"></pr-icon> Applications </uib-tab-heading>
               <kubernetes-applications-datatable
                 dataset="ctrl.state.applications"
                 table-key="kubernetes.applications"
@@ -23,12 +23,12 @@
               </kubernetes-applications-datatable>
             </uib-tab>
             <uib-tab index="1" classes="btn-sm" select="ctrl.selectTab(1)">
-              <uib-tab-heading> <i class="fa fa-exchange-alt space-right" aria-hidden="true"></i> Port mappings </uib-tab-heading>
+              <uib-tab-heading class="vertical-center"> <pr-icon icon="'repeat'" feather="true"></pr-icon> Port mappings </uib-tab-heading>
               <kubernetes-applications-ports-datatable dataset="ctrl.state.ports" table-key="kubernetes.applications.ports" order-by="Name" refresh-callback="ctrl.getApplications">
               </kubernetes-applications-ports-datatable>
             </uib-tab>
             <uib-tab index="2" classes="btn-sm" select="ctrl.selectTab(2)">
-              <uib-tab-heading> <i class="fa fa-th-list space-right" aria-hidden="true"></i> Stacks </uib-tab-heading>
+              <uib-tab-heading class="vertical-center"> <pr-icon icon="'list'" feather="true"></pr-icon> Stacks </uib-tab-heading>
               <kubernetes-applications-stacks-datatable
                 dataset="ctrl.state.stacks"
                 table-key="kubernetes.applications.stacks"
diff --git a/app/portainer/components/copy-button/copy-button.html b/app/portainer/components/copy-button/copy-button.html
index b7f3016af..8dac9814a 100644
--- a/app/portainer/components/copy-button/copy-button.html
+++ b/app/portainer/components/copy-button/copy-button.html
@@ -1,4 +1,10 @@
 <span>
-  <button type="button" class="btn btn-link nopadding" ng-click="$ctrl.copyValueText()" title="Copy Value"> <i class="fa fa-copy"></i> Copy </button>
-  <span ng-class="{ 'copy-button-fadeout': $ctrl.state.isFading }" class="copy-button-copy-text"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
+  <button type="button" class="btn btn-link nopadding" ng-click="$ctrl.copyValueText()" title="Copy Value">
+    <pr-icon icon="'clipboard'" feather="true"></pr-icon>
+    Copy
+  </button>
+  <span ng-class="{ 'copy-button-fadeout': $ctrl.state.isFading }" class="copy-button-copy-text">
+    <pr-icon icon="'check'" feather="true"></pr-icon>
+    copied
+  </span>
 </span>
diff --git a/app/portainer/components/datatables/datatable.css b/app/portainer/components/datatables/datatable.css
index 9733c5a36..4b92dd92a 100644
--- a/app/portainer/components/datatables/datatable.css
+++ b/app/portainer/components/datatables/datatable.css
@@ -47,6 +47,10 @@
   text-decoration: underline;
 }
 
+.datatable tr > td a.actions {
+  color: currentColor;
+}
+
 .toolBar .actionBar {
   display: inline-flex;
 }
diff --git a/app/portainer/components/show-hide/show-hide.html b/app/portainer/components/show-hide/show-hide.html
index eab73f094..5cd015520 100644
--- a/app/portainer/components/show-hide/show-hide.html
+++ b/app/portainer/components/show-hide/show-hide.html
@@ -4,6 +4,12 @@
 </div>
 
 <button type="button" class="btn btn-link nopadding" ng-click="$ctrl.show = !$ctrl.show" title="Show/Hide value">
-  <div ng-if="!$ctrl.show"> <i class="fa fa-eye-slash"></i> Show</div>
-  <div ng-if="$ctrl.show"> <i class="fa fa-eye"></i> Hide</div>
+  <div ng-if="!$ctrl.show">
+    <pr-icon icon="'eye-off'" feather="true"></pr-icon>
+    Show</div
+  >
+  <div ng-if="$ctrl.show">
+    <pr-icon icon="'eye'" feather="true"></pr-icon>
+    Hide</div
+  >
 </button>