diff --git a/.eslintrc.js b/.eslintrc.js
index 3fd52c2465..57ee07348f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -46,6 +46,8 @@ module.exports = {
           "avoidEscape": true,
           "allowTemplateLiterals": true,
         }],
+        "linebreak-style": ["error", "unix"],
+        "eol-last": ["error", "always"],
         "semi": ["error", "always"],
         "object-shorthand": "error",
         "prefer-template": "error",
@@ -101,6 +103,8 @@ module.exports = {
         }],
         "semi": "off",
         "@typescript-eslint/semi": ["error"],
+        "linebreak-style": ["error", "unix"],
+        "eol-last": ["error", "always"],
         "object-shorthand": "error",
         "prefer-template": "error",
         "template-curly-spacing": "error",
@@ -162,6 +166,8 @@ module.exports = {
         }],
         "semi": "off",
         "@typescript-eslint/semi": ["error"],
+        "linebreak-style": ["error", "unix"],
+        "eol-last": ["error", "always"],
         "object-shorthand": "error",
         "prefer-template": "error",
         "template-curly-spacing": "error",
diff --git a/__mocks__/imageMock.ts b/__mocks__/imageMock.ts
index a099545376..f053ebf797 100644
--- a/__mocks__/imageMock.ts
+++ b/__mocks__/imageMock.ts
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/__mocks__/styleMock.ts b/__mocks__/styleMock.ts
index a099545376..f053ebf797 100644
--- a/__mocks__/styleMock.ts
+++ b/__mocks__/styleMock.ts
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/extensions/kube-object-event-status/src/resolver.tsx b/extensions/kube-object-event-status/src/resolver.tsx
index 69691c2e79..5e9151288f 100644
--- a/extensions/kube-object-event-status/src/resolver.tsx
+++ b/extensions/kube-object-event-status/src/resolver.tsx
@@ -56,4 +56,4 @@ export function resolveStatusForCronJobs(cronJob: K8sApi.CronJob): K8sApi.KubeOb
     text: `${event.message}`,
     timestamp: event.metadata.creationTimestamp
   };
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 798bfb7193..57c7a8a657 100644
--- a/package.json
+++ b/package.json
@@ -219,7 +219,7 @@
     "request-promise-native": "^1.0.8",
     "semver": "^7.3.2",
     "serializr": "^2.0.3",
-    "shell-env": "^3.0.0",
+    "shell-env": "^3.0.1",
     "spdy": "^4.0.2",
     "tar": "^6.0.5",
     "tcp-port-used": "^1.0.1",
diff --git a/src/common/__tests__/search-store.test.ts b/src/common/__tests__/search-store.test.ts
index 7939ef1d8c..d361c858fd 100644
--- a/src/common/__tests__/search-store.test.ts
+++ b/src/common/__tests__/search-store.test.ts
@@ -77,4 +77,4 @@ describe("search store tests", () => {
     searchStore.onSearch(logs, "Starting");
     expect(searchStore.totalFinds).toBe(2);
   });
-});
\ No newline at end of file
+});
diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts
index 08ca359ce5..b74941a790 100644
--- a/src/common/__tests__/user-store.test.ts
+++ b/src/common/__tests__/user-store.test.ts
@@ -101,4 +101,4 @@ describe("user store tests", () => {
       expect(us.lastSeenAppVersion).toBe("0.0.0");
     });
   });
-});
\ No newline at end of file
+});
diff --git a/src/common/custom-errors.ts b/src/common/custom-errors.ts
index 9bcf3a998a..177ef7578f 100644
--- a/src/common/custom-errors.ts
+++ b/src/common/custom-errors.ts
@@ -10,4 +10,4 @@ export class ExecValidationNotFoundError extends Error {
     this.name = this.constructor.name;
     Error.captureStackTrace(this, this.constructor);
   }
-}
\ No newline at end of file
+}
diff --git a/src/common/kube-helpers.ts b/src/common/kube-helpers.ts
index bb0e6b86d2..02a9faef92 100644
--- a/src/common/kube-helpers.ts
+++ b/src/common/kube-helpers.ts
@@ -175,4 +175,4 @@ export function validateKubeConfig (config: KubeConfig) {
       throw new ExecValidationNotFoundError(execCommand, isAbsolute);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/common/prometheus-providers.ts b/src/common/prometheus-providers.ts
index a5c515b338..5496163c38 100644
--- a/src/common/prometheus-providers.ts
+++ b/src/common/prometheus-providers.ts
@@ -10,4 +10,4 @@ import { PrometheusProviderRegistry } from "../main/prometheus/provider-registry
   PrometheusProviderRegistry.registerProvider(provider.id, provider);
 });
 
-export const prometheusProviders = PrometheusProviderRegistry.getProviders();
\ No newline at end of file
+export const prometheusProviders = PrometheusProviderRegistry.getProviders();
diff --git a/src/common/search-store.ts b/src/common/search-store.ts
index a3aba9dcbe..eb2517ca0f 100644
--- a/src/common/search-store.ts
+++ b/src/common/search-store.ts
@@ -133,4 +133,4 @@ export class SearchStore {
   }
 }
 
-export const searchStore = new SearchStore;
\ No newline at end of file
+export const searchStore = new SearchStore;
diff --git a/src/common/utils/__tests__/splitArray.test.ts b/src/common/utils/__tests__/splitArray.test.ts
index a401e07701..1e1589fee2 100644
--- a/src/common/utils/__tests__/splitArray.test.ts
+++ b/src/common/utils/__tests__/splitArray.test.ts
@@ -28,4 +28,4 @@ describe("split array on element tests", () => {
   test("ten elements, in end array", () => {
     expect(splitArray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 9)).toStrictEqual([[0, 1, 2, 3, 4, 5, 6, 7, 8], [], true]);
   });
-});
\ No newline at end of file
+});
diff --git a/src/common/utils/singleton.ts b/src/common/utils/singleton.ts
index 61269d10b1..caa5471072 100644
--- a/src/common/utils/singleton.ts
+++ b/src/common/utils/singleton.ts
@@ -26,4 +26,4 @@ class Singleton {
 }
 
 export { Singleton };
-export default Singleton;
\ No newline at end of file
+export default Singleton;
diff --git a/src/extensions/interfaces/index.ts b/src/extensions/interfaces/index.ts
index c91d8cdd19..7b1c601537 100644
--- a/src/extensions/interfaces/index.ts
+++ b/src/extensions/interfaces/index.ts
@@ -1 +1 @@
-export * from "./registrations";
\ No newline at end of file
+export * from "./registrations";
diff --git a/src/extensions/interfaces/registrations.ts b/src/extensions/interfaces/registrations.ts
index 47c63062ea..ff51d9a824 100644
--- a/src/extensions/interfaces/registrations.ts
+++ b/src/extensions/interfaces/registrations.ts
@@ -5,4 +5,4 @@ export type { KubeObjectMenuRegistration, KubeObjectMenuComponents } from "../re
 export type { KubeObjectStatusRegistration } from "../registries/kube-object-status-registry";
 export type { PageRegistration, RegisteredPage, PageParams, PageComponentProps, PageComponents, PageTarget } from "../registries/page-registry";
 export type { PageMenuRegistration, ClusterPageMenuRegistration, PageMenuComponents } from "../registries/page-menu-registry";
-export type { StatusBarRegistration } from "../registries/status-bar-registry";
\ No newline at end of file
+export type { StatusBarRegistration } from "../registries/status-bar-registry";
diff --git a/src/extensions/renderer-api/kube-object-status.ts b/src/extensions/renderer-api/kube-object-status.ts
index f609d736fe..616ead1bb2 100644
--- a/src/extensions/renderer-api/kube-object-status.ts
+++ b/src/extensions/renderer-api/kube-object-status.ts
@@ -8,4 +8,4 @@ export enum KubeObjectStatusLevel {
   INFO = 1,
   WARNING = 2,
   CRITICAL = 3
-}
\ No newline at end of file
+}
diff --git a/src/extensions/renderer-api/theming.ts b/src/extensions/renderer-api/theming.ts
index f819036803..b3da69bdbc 100644
--- a/src/extensions/renderer-api/theming.ts
+++ b/src/extensions/renderer-api/theming.ts
@@ -2,4 +2,4 @@ import { themeStore } from "../../renderer/theme.store";
 
 export function getActiveTheme() {
   return themeStore.activeTheme;
-}
\ No newline at end of file
+}
diff --git a/src/main/cluster-detectors/base-cluster-detector.ts b/src/main/cluster-detectors/base-cluster-detector.ts
index 9d52e1a70e..885f96c33e 100644
--- a/src/main/cluster-detectors/base-cluster-detector.ts
+++ b/src/main/cluster-detectors/base-cluster-detector.ts
@@ -31,4 +31,4 @@ export class BaseClusterDetector {
       },
     });
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/cluster-detectors/cluster-id-detector.ts b/src/main/cluster-detectors/cluster-id-detector.ts
index 2e0cc694ff..810955afae 100644
--- a/src/main/cluster-detectors/cluster-id-detector.ts
+++ b/src/main/cluster-detectors/cluster-id-detector.ts
@@ -23,4 +23,4 @@ export class ClusterIdDetector extends BaseClusterDetector {
 
     return response.metadata.uid;
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/cluster-detectors/detector-registry.ts b/src/main/cluster-detectors/detector-registry.ts
index 43c56153c9..b1d1b73447 100644
--- a/src/main/cluster-detectors/detector-registry.ts
+++ b/src/main/cluster-detectors/detector-registry.ts
@@ -48,4 +48,4 @@ detectorRegistry.add(ClusterIdDetector);
 detectorRegistry.add(LastSeenDetector);
 detectorRegistry.add(VersionDetector);
 detectorRegistry.add(DistributionDetector);
-detectorRegistry.add(NodesCountDetector);
\ No newline at end of file
+detectorRegistry.add(NodesCountDetector);
diff --git a/src/main/cluster-detectors/last-seen-detector.ts b/src/main/cluster-detectors/last-seen-detector.ts
index e648d5f2f9..0a9bcf9f74 100644
--- a/src/main/cluster-detectors/last-seen-detector.ts
+++ b/src/main/cluster-detectors/last-seen-detector.ts
@@ -11,4 +11,4 @@ export class LastSeenDetector extends BaseClusterDetector {
 
     return { value: new Date().toJSON(), accuracy: 100 };
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/cluster-detectors/nodes-count-detector.ts b/src/main/cluster-detectors/nodes-count-detector.ts
index 0ece5dd080..45584df5bd 100644
--- a/src/main/cluster-detectors/nodes-count-detector.ts
+++ b/src/main/cluster-detectors/nodes-count-detector.ts
@@ -16,4 +16,4 @@ export class NodesCountDetector extends BaseClusterDetector {
 
     return response.items.length;
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/cluster-detectors/version-detector.ts b/src/main/cluster-detectors/version-detector.ts
index 8080ef57a1..b19979db8a 100644
--- a/src/main/cluster-detectors/version-detector.ts
+++ b/src/main/cluster-detectors/version-detector.ts
@@ -16,4 +16,4 @@ export class VersionDetector extends BaseClusterDetector {
 
     return response.gitVersion;
   }
-}
\ No newline at end of file
+}
diff --git a/src/migrations/cluster-store/index.ts b/src/migrations/cluster-store/index.ts
index c546fdaeda..4a71d4f7ad 100644
--- a/src/migrations/cluster-store/index.ts
+++ b/src/migrations/cluster-store/index.ts
@@ -18,4 +18,4 @@ export default {
   ...version270Beta1,
   ...version360Beta1,
   ...snap
-};
\ No newline at end of file
+};
diff --git a/src/renderer/api/__tests__/kube-api.test.ts b/src/renderer/api/__tests__/kube-api.test.ts
index 41078e77a3..7481bd096a 100644
--- a/src/renderer/api/__tests__/kube-api.test.ts
+++ b/src/renderer/api/__tests__/kube-api.test.ts
@@ -79,4 +79,4 @@ describe("KubeApi", () => {
     expect(kubeApi.apiPrefix).toEqual("/apis");
     expect(kubeApi.apiGroup).toEqual("extensions");
   });
-});
\ No newline at end of file
+});
diff --git a/src/renderer/api/workload-kube-object.ts b/src/renderer/api/workload-kube-object.ts
index e0c6d3f121..185d3d502c 100644
--- a/src/renderer/api/workload-kube-object.ts
+++ b/src/renderer/api/workload-kube-object.ts
@@ -1,7 +1,7 @@
 import get from "lodash/get";
 import { KubeObject } from "./kube-object";
 
-interface IToleration {
+export interface IToleration {
   key?: string;
   operator?: string;
   effect?: string;
@@ -82,4 +82,4 @@ export class WorkloadKubeObject extends KubeObject {
 
     return Object.keys(affinity).length;
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+apps-helm-charts/helm-charts.route.ts b/src/renderer/components/+apps-helm-charts/helm-charts.route.ts
index 9b8aecc499..97a0923d97 100644
--- a/src/renderer/components/+apps-helm-charts/helm-charts.route.ts
+++ b/src/renderer/components/+apps-helm-charts/helm-charts.route.ts
@@ -11,4 +11,4 @@ export interface IHelmChartsRouteParams {
   repo?: string;
 }
 
-export const helmChartsURL = buildURL<IHelmChartsRouteParams>(helmChartsRoute.path);
\ No newline at end of file
+export const helmChartsURL = buildURL<IHelmChartsRouteParams>(helmChartsRoute.path);
diff --git a/src/renderer/components/+apps-helm-charts/index.ts b/src/renderer/components/+apps-helm-charts/index.ts
index a9403c097c..c0649f3f38 100644
--- a/src/renderer/components/+apps-helm-charts/index.ts
+++ b/src/renderer/components/+apps-helm-charts/index.ts
@@ -1,2 +1,2 @@
 export * from "./helm-charts";
-export * from "./helm-charts.route";
\ No newline at end of file
+export * from "./helm-charts.route";
diff --git a/src/renderer/components/+apps-releases/index.ts b/src/renderer/components/+apps-releases/index.ts
index 32a4871769..bd80c60404 100644
--- a/src/renderer/components/+apps-releases/index.ts
+++ b/src/renderer/components/+apps-releases/index.ts
@@ -1,2 +1,2 @@
 export * from "./releases";
-export * from "./release.route";
\ No newline at end of file
+export * from "./release.route";
diff --git a/src/renderer/components/+apps/index.ts b/src/renderer/components/+apps/index.ts
index 70c0169777..330891b2b1 100644
--- a/src/renderer/components/+apps/index.ts
+++ b/src/renderer/components/+apps/index.ts
@@ -1,2 +1,2 @@
 export * from "./apps";
-export * from "./apps.route";
\ No newline at end of file
+export * from "./apps.route";
diff --git a/src/renderer/components/+cluster-settings/components/cluster-home-dir-setting.tsx b/src/renderer/components/+cluster-settings/components/cluster-home-dir-setting.tsx
index 35c18cc5e5..10aabf3ff7 100644
--- a/src/renderer/components/+cluster-settings/components/cluster-home-dir-setting.tsx
+++ b/src/renderer/components/+cluster-settings/components/cluster-home-dir-setting.tsx
@@ -48,4 +48,4 @@ export class ClusterHomeDirSetting extends React.Component<Props> {
       </>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx b/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx
index 631c6d54ef..9d953ef9ca 100644
--- a/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx
+++ b/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx
@@ -45,4 +45,4 @@ export class ClusterNameSetting extends React.Component<Props> {
       </>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+cluster-settings/components/cluster-proxy-setting.tsx b/src/renderer/components/+cluster-settings/components/cluster-proxy-setting.tsx
index 3887487816..eb122ac444 100644
--- a/src/renderer/components/+cluster-settings/components/cluster-proxy-setting.tsx
+++ b/src/renderer/components/+cluster-settings/components/cluster-proxy-setting.tsx
@@ -45,4 +45,4 @@ export class ClusterProxySetting extends React.Component<Props> {
       </>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+cluster-settings/general.tsx b/src/renderer/components/+cluster-settings/general.tsx
index 1d498bc94b..91fce05164 100644
--- a/src/renderer/components/+cluster-settings/general.tsx
+++ b/src/renderer/components/+cluster-settings/general.tsx
@@ -25,4 +25,4 @@ export class General extends React.Component<Props> {
       <ClusterAccessibleNamespaces cluster={this.props.cluster} />
     </div>;
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+cluster-settings/removal.tsx b/src/renderer/components/+cluster-settings/removal.tsx
index 7d97e9c515..495fb71fe8 100644
--- a/src/renderer/components/+cluster-settings/removal.tsx
+++ b/src/renderer/components/+cluster-settings/removal.tsx
@@ -17,4 +17,4 @@ export class Removal extends React.Component<Props> {
       </div>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+cluster-settings/status.tsx b/src/renderer/components/+cluster-settings/status.tsx
index 7f21d19aba..d43cfe5c35 100644
--- a/src/renderer/components/+cluster-settings/status.tsx
+++ b/src/renderer/components/+cluster-settings/status.tsx
@@ -58,4 +58,4 @@ export class Status extends React.Component<Props> {
       </div>
     </div>;
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+cluster/cluster-issues.tsx b/src/renderer/components/+cluster/cluster-issues.tsx
index eb85bf79f8..0aabebaa27 100644
--- a/src/renderer/components/+cluster/cluster-issues.tsx
+++ b/src/renderer/components/+cluster/cluster-issues.tsx
@@ -23,11 +23,13 @@ interface IWarning extends ItemObject {
   kind: string;
   message: string;
   selfLink: string;
+  age: string | number;
 }
 
 enum sortBy {
   type = "type",
-  object = "object"
+  object = "object",
+  age = "age",
 }
 
 @observer
@@ -35,6 +37,7 @@ export class ClusterIssues extends React.Component<Props> {
   private sortCallbacks = {
     [sortBy.type]: (warning: IWarning) => warning.kind,
     [sortBy.object]: (warning: IWarning) => warning.getName(),
+    [sortBy.age]: (warning: IWarning) => warning.age || "",
   };
 
   @computed get warnings() {
@@ -42,15 +45,16 @@ export class ClusterIssues extends React.Component<Props> {
 
     // Node bad conditions
     nodesStore.items.forEach(node => {
-      const { kind, selfLink, getId, getName } = node;
+      const { kind, selfLink, getId, getName, getAge } = node;
 
       node.getWarningConditions().forEach(({ message }) => {
         warnings.push({
-          kind,
+          age: getAge(),
           getId,
           getName,
-          selfLink,
+          kind,
           message,
+          selfLink,
         });
       });
     });
@@ -59,12 +63,13 @@ export class ClusterIssues extends React.Component<Props> {
     const events = eventStore.getWarnings();
 
     events.forEach(error => {
-      const { message, involvedObject } = error;
+      const { message, involvedObject, getAge } = error;
       const { uid, name, kind } = involvedObject;
 
       warnings.push({
         getId: () => uid,
         getName: () => name,
+        age: getAge(),
         message,
         kind,
         selfLink: lookupApiLink(involvedObject, error),
@@ -78,7 +83,7 @@ export class ClusterIssues extends React.Component<Props> {
   getTableRow(uid: string) {
     const { warnings } = this;
     const warning = warnings.find(warn => warn.getId() == uid);
-    const { getId, getName, message, kind, selfLink } = warning;
+    const { getId, getName, message, kind, selfLink, age } = warning;
 
     return (
       <TableRow
@@ -96,6 +101,9 @@ export class ClusterIssues extends React.Component<Props> {
         <TableCell className="kind">
           {kind}
         </TableCell>
+        <TableCell className="age">
+          {age}
+        </TableCell>
       </TableRow>
     );
   }
@@ -139,6 +147,7 @@ export class ClusterIssues extends React.Component<Props> {
             <TableCell className="message">Message</TableCell>
             <TableCell className="object" sortBy={sortBy.object}>Object</TableCell>
             <TableCell className="kind" sortBy={sortBy.type}>Type</TableCell>
+            <TableCell className="timestamp" sortBy={sortBy.age}>Age</TableCell>
           </TableHead>
         </Table>
       </>
diff --git a/src/renderer/components/+cluster/cluster-metrics.tsx b/src/renderer/components/+cluster/cluster-metrics.tsx
index 6461bae7f3..2bdaded8b7 100644
--- a/src/renderer/components/+cluster/cluster-metrics.tsx
+++ b/src/renderer/components/+cluster/cluster-metrics.tsx
@@ -95,4 +95,4 @@ export const ClusterMetrics = observer(() => {
       {renderMetrics()}
     </div>
   );
-});
\ No newline at end of file
+});
diff --git a/src/renderer/components/+landing-page/index.tsx b/src/renderer/components/+landing-page/index.tsx
index 4bdb2a706c..c7eacf1bd0 100644
--- a/src/renderer/components/+landing-page/index.tsx
+++ b/src/renderer/components/+landing-page/index.tsx
@@ -1,2 +1,2 @@
 export * from "./landing-page.route";
-export * from "./landing-page";
\ No newline at end of file
+export * from "./landing-page";
diff --git a/src/renderer/components/+pod-security-policies/index.ts b/src/renderer/components/+pod-security-policies/index.ts
index d037873b5b..c9379d3381 100644
--- a/src/renderer/components/+pod-security-policies/index.ts
+++ b/src/renderer/components/+pod-security-policies/index.ts
@@ -1,3 +1,3 @@
 export * from "./pod-security-policies.route";
 export * from "./pod-security-policies";
-export * from "./pod-security-policy-details";
\ No newline at end of file
+export * from "./pod-security-policy-details";
diff --git a/src/renderer/components/+user-management-roles/roles.store.ts b/src/renderer/components/+user-management-roles/roles.store.ts
index bf179f9a3c..82b0e66612 100644
--- a/src/renderer/components/+user-management-roles/roles.store.ts
+++ b/src/renderer/components/+user-management-roles/roles.store.ts
@@ -47,4 +47,4 @@ export const rolesStore = new RolesStore();
 apiManager.registerStore(rolesStore, [
   roleApi,
   clusterRoleApi,
-]);
\ No newline at end of file
+]);
diff --git a/src/renderer/components/+user-management-service-accounts/index.ts b/src/renderer/components/+user-management-service-accounts/index.ts
index fd45e28288..bd81292bf1 100644
--- a/src/renderer/components/+user-management-service-accounts/index.ts
+++ b/src/renderer/components/+user-management-service-accounts/index.ts
@@ -1,3 +1,3 @@
 export * from "./service-accounts";
 export * from "./service-accounts-details";
-export * from "./create-service-account-dialog";
\ No newline at end of file
+export * from "./create-service-account-dialog";
diff --git a/src/renderer/components/+user-management/index.ts b/src/renderer/components/+user-management/index.ts
index 6f29869b9b..4ff825df97 100644
--- a/src/renderer/components/+user-management/index.ts
+++ b/src/renderer/components/+user-management/index.ts
@@ -1,2 +1,2 @@
 export * from "./user-management";
-export * from "./user-management.route";
\ No newline at end of file
+export * from "./user-management.route";
diff --git a/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx b/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx
new file mode 100644
index 0000000000..dbde813e5a
--- /dev/null
+++ b/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx
@@ -0,0 +1,59 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import React from "react";
+import "@testing-library/jest-dom/extend-expect";
+import { fireEvent, render } from "@testing-library/react";
+import { IToleration } from "../../../api/workload-kube-object";
+import { PodTolerations } from "../pod-tolerations";
+
+const tolerations: IToleration[] =[
+  {
+    key: "CriticalAddonsOnly",
+    operator: "Exist",
+    effect: "NoExecute",
+    tolerationSeconds: 3600
+  },
+  {
+    key: "node.kubernetes.io/not-ready",
+    operator: "NoExist",
+    effect: "NoSchedule",
+    tolerationSeconds: 7200
+  },
+];
+
+describe("<PodTolerations />", () => {
+  it("renders w/o errors", () => {
+    const { container } = render(<PodTolerations tolerations={tolerations} />);
+
+    expect(container).toBeInstanceOf(HTMLElement);
+  });
+
+  it("shows all tolerations", () => {
+    const { container } = render(<PodTolerations tolerations={tolerations} />);
+    const rows = container.querySelectorAll(".TableRow");
+
+    expect(rows[0].querySelector(".key").textContent).toBe("CriticalAddonsOnly");
+    expect(rows[0].querySelector(".operator").textContent).toBe("Exist");
+    expect(rows[0].querySelector(".effect").textContent).toBe("NoExecute");
+    expect(rows[0].querySelector(".seconds").textContent).toBe("3600");
+
+    expect(rows[1].querySelector(".key").textContent).toBe("node.kubernetes.io/not-ready");
+    expect(rows[1].querySelector(".operator").textContent).toBe("NoExist");
+    expect(rows[1].querySelector(".effect").textContent).toBe("NoSchedule");
+    expect(rows[1].querySelector(".seconds").textContent).toBe("7200");
+  });
+
+  it("sorts table properly", () => {
+    const { container, getByText } = render(<PodTolerations tolerations={tolerations} />);
+    const headCell = getByText("Key");
+
+    fireEvent.click(headCell);
+    fireEvent.click(headCell);
+
+    const rows = container.querySelectorAll(".TableRow");
+
+    expect(rows[0].querySelector(".key").textContent).toBe("node.kubernetes.io/not-ready");
+  });
+});
diff --git a/src/renderer/components/+workloads-pods/index.ts b/src/renderer/components/+workloads-pods/index.ts
index f3181cb3a2..cc7782911c 100644
--- a/src/renderer/components/+workloads-pods/index.ts
+++ b/src/renderer/components/+workloads-pods/index.ts
@@ -1,2 +1,2 @@
 export * from "./pods";
-export * from "./pod-details";
\ No newline at end of file
+export * from "./pod-details";
diff --git a/src/renderer/components/+workloads-pods/pod-details-statuses.tsx b/src/renderer/components/+workloads-pods/pod-details-statuses.tsx
index 5ce8465e72..1e0f765381 100644
--- a/src/renderer/components/+workloads-pods/pod-details-statuses.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details-statuses.tsx
@@ -27,4 +27,4 @@ export class PodDetailsStatuses extends React.Component<Props> {
       </div>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/+workloads-pods/pod-details-tolerations.scss b/src/renderer/components/+workloads-pods/pod-details-tolerations.scss
index 0aa68fa1d6..1ac932cd9d 100644
--- a/src/renderer/components/+workloads-pods/pod-details-tolerations.scss
+++ b/src/renderer/components/+workloads-pods/pod-details-tolerations.scss
@@ -1,5 +1,23 @@
 .PodDetailsTolerations {
-  .toleration {
-    margin-bottom: $margin;
+  grid-template-columns: auto;
+
+  .PodTolerations {
+    margin-top: var(--margin);
+  }
+
+  // Expanding value cell to cover 2 columns (whole Drawer width)
+
+  > .name {
+    grid-row-start: 1;
+    grid-column-start: 1;
+  }
+
+  > .value {
+    grid-row-start: 1;
+    grid-column-start: 1;
+  }
+
+  .DrawerParamToggler > .params {
+    margin-left: var(--drawer-item-title-width);
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+workloads-pods/pod-details-tolerations.tsx b/src/renderer/components/+workloads-pods/pod-details-tolerations.tsx
index 8b67502e26..67bd5a07d0 100644
--- a/src/renderer/components/+workloads-pods/pod-details-tolerations.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details-tolerations.tsx
@@ -1,10 +1,11 @@
 import "./pod-details-tolerations.scss";
 import React from "react";
-import { Pod, Deployment, DaemonSet, StatefulSet, ReplicaSet, Job } from "../../api/endpoints";
 import { DrawerParamToggler, DrawerItem } from "../drawer";
+import { WorkloadKubeObject } from "../../api/workload-kube-object";
+import { PodTolerations } from "./pod-tolerations";
 
 interface Props {
-  workload: Pod | Deployment | DaemonSet | StatefulSet | ReplicaSet | Job;
+  workload: WorkloadKubeObject;
 }
 
 export class PodDetailsTolerations extends React.Component<Props> {
@@ -17,20 +18,7 @@ export class PodDetailsTolerations extends React.Component<Props> {
     return (
       <DrawerItem name="Tolerations" className="PodDetailsTolerations">
         <DrawerParamToggler label={tolerations.length}>
-          {
-            tolerations.map((toleration, index) => {
-              const { key, operator, effect, tolerationSeconds } = toleration;
-
-              return (
-                <div className="toleration" key={index}>
-                  <DrawerItem name="Key">{key}</DrawerItem>
-                  {operator && <DrawerItem name="Operator">{operator}</DrawerItem>}
-                  {effect && <DrawerItem name="Effect">{effect}</DrawerItem>}
-                  {!!tolerationSeconds && <DrawerItem name="Effect">{tolerationSeconds}</DrawerItem>}
-                </div>
-              );
-            })
-          }
+          <PodTolerations tolerations={tolerations} />
         </DrawerParamToggler>
       </DrawerItem>
     );
diff --git a/src/renderer/components/+workloads-pods/pod-tolerations.scss b/src/renderer/components/+workloads-pods/pod-tolerations.scss
new file mode 100644
index 0000000000..b840697685
--- /dev/null
+++ b/src/renderer/components/+workloads-pods/pod-tolerations.scss
@@ -0,0 +1,14 @@
+.PodTolerations {
+  .TableHead {
+    background-color: var(--drawerSubtitleBackground);
+  }
+
+  .TableCell {
+    white-space: normal;
+    word-break: normal;
+
+    &.key {
+      flex-grow: 3;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/+workloads-pods/pod-tolerations.tsx b/src/renderer/components/+workloads-pods/pod-tolerations.tsx
new file mode 100644
index 0000000000..e8d3d7d099
--- /dev/null
+++ b/src/renderer/components/+workloads-pods/pod-tolerations.tsx
@@ -0,0 +1,63 @@
+import "./pod-tolerations.scss";
+import React from "react";
+import uniqueId from "lodash/uniqueId";
+
+import { IToleration } from "../../api/workload-kube-object";
+import { Table, TableCell, TableHead, TableRow } from "../table";
+
+interface Props {
+  tolerations: IToleration[];
+}
+
+enum sortBy {
+  Key = "key",
+  Operator = "operator",
+  Effect = "effect",
+  Seconds = "seconds",
+}
+
+const sortingCallbacks = {
+  [sortBy.Key]: (toleration: IToleration) => toleration.key,
+  [sortBy.Operator]: (toleration: IToleration) => toleration.operator,
+  [sortBy.Effect]: (toleration: IToleration) => toleration.effect,
+  [sortBy.Seconds]: (toleration: IToleration) => toleration.tolerationSeconds,
+};
+
+const getTableRow = (toleration: IToleration) => {
+  const { key, operator, effect, tolerationSeconds } = toleration;
+
+  return (
+    <TableRow
+      key={uniqueId("toleration-")}
+      sortItem={toleration}
+      nowrap
+    >
+      <TableCell className="key">{key}</TableCell>
+      <TableCell className="operator">{operator}</TableCell>
+      <TableCell className="effect">{effect}</TableCell>
+      <TableCell className="seconds">{tolerationSeconds}</TableCell>
+    </TableRow>
+  );
+};
+
+export function PodTolerations({ tolerations }: Props) {
+  return (
+    <Table
+      selectable
+      scrollable={false}
+      sortable={sortingCallbacks}
+      sortSyncWithUrl={false}
+      className="PodTolerations"
+    >
+      <TableHead sticky={false}>
+        <TableCell className="key" sortBy={sortBy.Key}>Key</TableCell>
+        <TableCell className="operator" sortBy={sortBy.Operator}>Operator</TableCell>
+        <TableCell className="effect" sortBy={sortBy.Effect}>Effect</TableCell>
+        <TableCell className="seconds" sortBy={sortBy.Seconds}>Seconds</TableCell>
+      </TableHead>
+      {
+        tolerations.map(getTableRow)
+      }
+    </Table>
+  );
+}
diff --git a/src/renderer/components/+workloads-statefulsets/index.ts b/src/renderer/components/+workloads-statefulsets/index.ts
index 1cb72d701a..af942b604f 100644
--- a/src/renderer/components/+workloads-statefulsets/index.ts
+++ b/src/renderer/components/+workloads-statefulsets/index.ts
@@ -1,2 +1,2 @@
 export * from "./statefulsets";
-export * from "./statefulset-details";
\ No newline at end of file
+export * from "./statefulset-details";
diff --git a/src/renderer/components/ace-editor/ace-editor.tsx b/src/renderer/components/ace-editor/ace-editor.tsx
index 68ef92635a..2dceb48bba 100644
--- a/src/renderer/components/ace-editor/ace-editor.tsx
+++ b/src/renderer/components/ace-editor/ace-editor.tsx
@@ -154,4 +154,4 @@ export class AceEditor extends React.Component<Props, State> {
       </div>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/ace-editor/index.ts b/src/renderer/components/ace-editor/index.ts
index 7bfc7c01ea..173845abab 100644
--- a/src/renderer/components/ace-editor/index.ts
+++ b/src/renderer/components/ace-editor/index.ts
@@ -1 +1 @@
-export * from "./ace-editor";
\ No newline at end of file
+export * from "./ace-editor";
diff --git a/src/renderer/components/add-remove-buttons/index.ts b/src/renderer/components/add-remove-buttons/index.ts
index 825c59d7d2..fa2deb84ec 100644
--- a/src/renderer/components/add-remove-buttons/index.ts
+++ b/src/renderer/components/add-remove-buttons/index.ts
@@ -1 +1 @@
-export * from "./add-remove-buttons";
\ No newline at end of file
+export * from "./add-remove-buttons";
diff --git a/src/renderer/components/animate/index.ts b/src/renderer/components/animate/index.ts
index 080c5446c8..36d812de20 100644
--- a/src/renderer/components/animate/index.ts
+++ b/src/renderer/components/animate/index.ts
@@ -1 +1 @@
-export * from "./animate";
\ No newline at end of file
+export * from "./animate";
diff --git a/src/renderer/components/chart/background-block.plugin.ts b/src/renderer/components/chart/background-block.plugin.ts
index 1d39f71aed..ff4816c4dd 100644
--- a/src/renderer/components/chart/background-block.plugin.ts
+++ b/src/renderer/components/chart/background-block.plugin.ts
@@ -39,4 +39,4 @@ export const BackgroundBlock = {
     ctx.stroke();
     ctx.restore();
   }
-};
\ No newline at end of file
+};
diff --git a/src/renderer/components/chart/bar-chart.tsx b/src/renderer/components/chart/bar-chart.tsx
index 69b65b10c9..4f80258703 100644
--- a/src/renderer/components/chart/bar-chart.tsx
+++ b/src/renderer/components/chart/bar-chart.tsx
@@ -220,4 +220,4 @@ export const cpuOptions: ChartOptions = {
       }
     }
   }
-};
\ No newline at end of file
+};
diff --git a/src/renderer/components/chart/chart.tsx b/src/renderer/components/chart/chart.tsx
index b7e621be22..e42a308848 100644
--- a/src/renderer/components/chart/chart.tsx
+++ b/src/renderer/components/chart/chart.tsx
@@ -213,4 +213,4 @@ export class Chart extends React.Component<ChartProps> {
       </>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/chart/index.ts b/src/renderer/components/chart/index.ts
index a9db66c298..d75ddf7a2f 100644
--- a/src/renderer/components/chart/index.ts
+++ b/src/renderer/components/chart/index.ts
@@ -1,3 +1,3 @@
 export * from "./chart";
 export * from "./pie-chart";
-export * from "./bar-chart";
\ No newline at end of file
+export * from "./bar-chart";
diff --git a/src/renderer/components/chart/pie-chart.tsx b/src/renderer/components/chart/pie-chart.tsx
index 1c629ab505..939d6bb612 100644
--- a/src/renderer/components/chart/pie-chart.tsx
+++ b/src/renderer/components/chart/pie-chart.tsx
@@ -64,4 +64,4 @@ export class PieChart extends React.Component<Props> {
 
 ChartJS.Tooltip.positioners.cursor = function (elements: any, position: { x: number; y: number }) {
   return position;
-};
\ No newline at end of file
+};
diff --git a/src/renderer/components/chart/useRealTimeMetrics.ts b/src/renderer/components/chart/useRealTimeMetrics.ts
index 69e4e3da7f..b01629e8e9 100644
--- a/src/renderer/components/chart/useRealTimeMetrics.ts
+++ b/src/renderer/components/chart/useRealTimeMetrics.ts
@@ -42,4 +42,4 @@ export function useRealTimeMetrics(metrics: IMetricValues, chartData: IChartData
   }
 
   return data;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/chart/zebra-stripes.plugin.ts b/src/renderer/components/chart/zebra-stripes.plugin.ts
index f934f88fb2..3a85f8d0a2 100644
--- a/src/renderer/components/chart/zebra-stripes.plugin.ts
+++ b/src/renderer/components/chart/zebra-stripes.plugin.ts
@@ -95,4 +95,4 @@ export const ZebraStripes = {
       cover.style.backgroundPositionX = `${-step * minutes}px`;
     }
   }
-};
\ No newline at end of file
+};
diff --git a/src/renderer/components/checkbox/checkbox.tsx b/src/renderer/components/checkbox/checkbox.tsx
index f97740a874..8d452a1198 100644
--- a/src/renderer/components/checkbox/checkbox.tsx
+++ b/src/renderer/components/checkbox/checkbox.tsx
@@ -50,4 +50,4 @@ export class Checkbox extends React.PureComponent<CheckboxProps> {
       </label>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/checkbox/index.ts b/src/renderer/components/checkbox/index.ts
index 7af8873e06..057f167821 100644
--- a/src/renderer/components/checkbox/index.ts
+++ b/src/renderer/components/checkbox/index.ts
@@ -1 +1 @@
-export * from "./checkbox";
\ No newline at end of file
+export * from "./checkbox";
diff --git a/src/renderer/components/cluster-icon/index.ts b/src/renderer/components/cluster-icon/index.ts
index 4e1858939f..7879490b85 100644
--- a/src/renderer/components/cluster-icon/index.ts
+++ b/src/renderer/components/cluster-icon/index.ts
@@ -1 +1 @@
-export * from "./cluster-icon";
\ No newline at end of file
+export * from "./cluster-icon";
diff --git a/src/renderer/components/confirm-dialog/index.ts b/src/renderer/components/confirm-dialog/index.ts
index dfcd83ded3..4627fd6882 100644
--- a/src/renderer/components/confirm-dialog/index.ts
+++ b/src/renderer/components/confirm-dialog/index.ts
@@ -1 +1 @@
-export * from "./confirm-dialog";
\ No newline at end of file
+export * from "./confirm-dialog";
diff --git a/src/renderer/components/dock/dock-tabs.tsx b/src/renderer/components/dock/dock-tabs.tsx
index 6bf9280d59..554411024b 100644
--- a/src/renderer/components/dock/dock-tabs.tsx
+++ b/src/renderer/components/dock/dock-tabs.tsx
@@ -48,4 +48,4 @@ export const DockTabs = ({ tabs, autoFocus, selectedTab, onChangeTab }: Props) =
       {tabs.map(tab => <Fragment key={tab.id}>{renderTab(tab)}</Fragment>)}
     </Tabs>
   );
-};
\ No newline at end of file
+};
diff --git a/src/renderer/components/dock/info-panel.scss b/src/renderer/components/dock/info-panel.scss
index 482dbee02d..cf9b3268b2 100644
--- a/src/renderer/components/dock/info-panel.scss
+++ b/src/renderer/components/dock/info-panel.scss
@@ -1,12 +1,16 @@
 .InfoPanel {
   @include hidden-scrollbar;
 
-  background: $dockInfoBackground;
-  padding: $padding $padding * 2;
+  background: var(--dockInfoBackground);
+  padding: var(--padding) calc(var(--padding) * 2);
   flex-shrink: 0;
 
   .Spinner {
-    margin-right: $padding;
+    margin-right: var(--padding);
+  }
+
+  .Badge {
+    background-color: var(--dockBadgeBackground);
   }
 
   > .controls {
@@ -15,8 +19,8 @@
 
     &:not(:empty) + .info {
       min-height: 25px;
-      padding-left: $padding;
-      padding-right: $padding;
+      padding-left: var(--padding);
+      padding-right: var(--padding);
     }
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/dock/log-controls.tsx b/src/renderer/components/dock/log-controls.tsx
index cedff7fbb9..06bbf12863 100644
--- a/src/renderer/components/dock/log-controls.tsx
+++ b/src/renderer/components/dock/log-controls.tsx
@@ -41,7 +41,12 @@ export const LogControls = observer((props: Props) => {
   return (
     <div className={cssNames("LogControls flex gaps align-center justify-space-between wrap")}>
       <div className="time-range">
-        {since && `Logs from ${new Date(since[0]).toLocaleString()}`}
+        {since && (
+          <span>
+            Logs from{" "}
+            <b>{new Date(since[0]).toLocaleString()}</b>
+          </span>
+        )}
       </div>
       <div className="flex gaps align-center">
         <Checkbox
diff --git a/src/renderer/components/drawer/drawer-item.scss b/src/renderer/components/drawer/drawer-item.scss
index f7727414a3..a9c54120df 100644
--- a/src/renderer/components/drawer/drawer-item.scss
+++ b/src/renderer/components/drawer/drawer-item.scss
@@ -1,6 +1,8 @@
 .DrawerItem {
+  --drawer-item-title-width: 30%;
+
   display: grid;
-  grid-template-columns: minmax(30%, min-content) auto;
+  grid-template-columns: minmax(var(--drawer-item-title-width), min-content) auto;
   border-bottom: 1px solid $borderFaintColor;
   padding: $padding 0;
 
diff --git a/src/renderer/components/drawer/drawer-param-toggler.tsx b/src/renderer/components/drawer/drawer-param-toggler.tsx
index 85772d0855..df97a4d1bd 100644
--- a/src/renderer/components/drawer/drawer-param-toggler.tsx
+++ b/src/renderer/components/drawer/drawer-param-toggler.tsx
@@ -25,7 +25,7 @@ export class DrawerParamToggler extends React.Component<DrawerParamTogglerProps,
 
     return (
       <div className="DrawerParamToggler">
-        <div className="flex gaps align-center">
+        <div className="flex gaps align-center params">
           <div className="param-label">{label}</div>
           <div className="param-link" onClick={this.toggle}>
             <span className="param-link-text">{link}</span>
diff --git a/src/renderer/components/drawer/drawer.scss b/src/renderer/components/drawer/drawer.scss
index b34b3b5965..8b7fc27993 100644
--- a/src/renderer/components/drawer/drawer.scss
+++ b/src/renderer/components/drawer/drawer.scss
@@ -69,7 +69,6 @@
     padding: var(--spacing);
 
     .Table .TableHead {
-      background-color: $contentColor;
       border-bottom: 1px solid $borderFaintColor;
     }
   }
diff --git a/src/renderer/components/editable-list/index.ts b/src/renderer/components/editable-list/index.ts
index cc0293acd6..1dc93d5df7 100644
--- a/src/renderer/components/editable-list/index.ts
+++ b/src/renderer/components/editable-list/index.ts
@@ -1 +1 @@
-export * from "./editable-list";
\ No newline at end of file
+export * from "./editable-list";
diff --git a/src/renderer/components/error-boundary/index.ts b/src/renderer/components/error-boundary/index.ts
index cdcf838466..90e954fb2e 100644
--- a/src/renderer/components/error-boundary/index.ts
+++ b/src/renderer/components/error-boundary/index.ts
@@ -1 +1 @@
-export * from "./error-boundary";
\ No newline at end of file
+export * from "./error-boundary";
diff --git a/src/renderer/components/file-picker/file-picker.tsx b/src/renderer/components/file-picker/file-picker.tsx
index 14cd6c07e8..1a52fe4973 100644
--- a/src/renderer/components/file-picker/file-picker.tsx
+++ b/src/renderer/components/file-picker/file-picker.tsx
@@ -209,4 +209,4 @@ export class FilePicker extends React.Component<Props> {
         return <Icon material="error" title={this.errorText}></Icon>;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/file-picker/index.ts b/src/renderer/components/file-picker/index.ts
index f58aec1470..28c490afab 100644
--- a/src/renderer/components/file-picker/index.ts
+++ b/src/renderer/components/file-picker/index.ts
@@ -1 +1 @@
-export * from "./file-picker";
\ No newline at end of file
+export * from "./file-picker";
diff --git a/src/renderer/components/icon/index.ts b/src/renderer/components/icon/index.ts
index 5cdcefa69c..b975409af4 100644
--- a/src/renderer/components/icon/index.ts
+++ b/src/renderer/components/icon/index.ts
@@ -1 +1 @@
-export * from "./icon";
\ No newline at end of file
+export * from "./icon";
diff --git a/src/renderer/components/input/search-input-url.tsx b/src/renderer/components/input/search-input-url.tsx
index 2b1045ede2..c0e00d6e56 100644
--- a/src/renderer/components/input/search-input-url.tsx
+++ b/src/renderer/components/input/search-input-url.tsx
@@ -54,4 +54,4 @@ export class SearchInputUrl extends React.Component<Props> {
       />
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/item-object-list/index.tsx b/src/renderer/components/item-object-list/index.tsx
index b0b106b298..87ba0e908a 100644
--- a/src/renderer/components/item-object-list/index.tsx
+++ b/src/renderer/components/item-object-list/index.tsx
@@ -1 +1 @@
-export * from "./item-list-layout";
\ No newline at end of file
+export * from "./item-list-layout";
diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx
index 875cbf0a09..89f76c70a4 100644
--- a/src/renderer/components/item-object-list/item-list-layout.tsx
+++ b/src/renderer/components/item-object-list/item-list-layout.tsx
@@ -2,7 +2,7 @@ import "./item-list-layout.scss";
 import groupBy from "lodash/groupBy";
 
 import React, { ReactNode } from "react";
-import { computed, observable, reaction, toJS } from "mobx";
+import { computed, IReactionDisposer, observable, reaction, toJS } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { ConfirmDialog, ConfirmDialogParams } from "../confirm-dialog";
 import { Table, TableCell, TableCellProps, TableHead, TableProps, TableRow, TableRowProps, TableSortCallback } from "../table";
diff --git a/src/renderer/components/kube-object-status-icon/index.ts b/src/renderer/components/kube-object-status-icon/index.ts
index 36751596a0..3ef2e6b29c 100644
--- a/src/renderer/components/kube-object-status-icon/index.ts
+++ b/src/renderer/components/kube-object-status-icon/index.ts
@@ -1 +1 @@
-export * from "./kube-object-status-icon";
\ No newline at end of file
+export * from "./kube-object-status-icon";
diff --git a/src/renderer/components/kubeconfig-dialog/index.ts b/src/renderer/components/kubeconfig-dialog/index.ts
index fdd244fe98..cb8c90cc14 100644
--- a/src/renderer/components/kubeconfig-dialog/index.ts
+++ b/src/renderer/components/kubeconfig-dialog/index.ts
@@ -1 +1 @@
-export * from "./kubeconfig-dialog";
\ No newline at end of file
+export * from "./kubeconfig-dialog";
diff --git a/src/renderer/components/layout/__test__/main-layout-header.test.tsx b/src/renderer/components/layout/__test__/main-layout-header.test.tsx
index b2a7bb5d93..499839072c 100644
--- a/src/renderer/components/layout/__test__/main-layout-header.test.tsx
+++ b/src/renderer/components/layout/__test__/main-layout-header.test.tsx
@@ -46,4 +46,4 @@ describe("<MainLayoutHeader />", () => {
 
     expect(getByText("minikube")).toBeInTheDocument();
   });
-});
\ No newline at end of file
+});
diff --git a/src/renderer/components/layout/login-layout.tsx b/src/renderer/components/layout/login-layout.tsx
index 8aa9c08e0b..669f783769 100755
--- a/src/renderer/components/layout/login-layout.tsx
+++ b/src/renderer/components/layout/login-layout.tsx
@@ -34,4 +34,4 @@ export class LoginLayout extends React.Component<Props> {
       </section>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/layout/sidebar-context.ts b/src/renderer/components/layout/sidebar-context.ts
index fff192cba3..7001bbc319 100644
--- a/src/renderer/components/layout/sidebar-context.ts
+++ b/src/renderer/components/layout/sidebar-context.ts
@@ -4,4 +4,4 @@ export const SidebarContext = React.createContext<SidebarContextValue>({ pinned:
 
 export type SidebarContextValue = {
   pinned: boolean;
-};
\ No newline at end of file
+};
diff --git a/src/renderer/components/line-progress/index.ts b/src/renderer/components/line-progress/index.ts
index 91942d706a..bd76106dbb 100644
--- a/src/renderer/components/line-progress/index.ts
+++ b/src/renderer/components/line-progress/index.ts
@@ -1 +1 @@
-export * from "./line-progress";
\ No newline at end of file
+export * from "./line-progress";
diff --git a/src/renderer/components/markdown-viewer/index.ts b/src/renderer/components/markdown-viewer/index.ts
index e82c6ba3c3..3c42af15f4 100644
--- a/src/renderer/components/markdown-viewer/index.ts
+++ b/src/renderer/components/markdown-viewer/index.ts
@@ -1 +1 @@
-export * from "./markdown-viewer";
\ No newline at end of file
+export * from "./markdown-viewer";
diff --git a/src/renderer/components/markdown-viewer/markdown-viewer.tsx b/src/renderer/components/markdown-viewer/markdown-viewer.tsx
index b1a2334b97..08478cb5a9 100644
--- a/src/renderer/components/markdown-viewer/markdown-viewer.tsx
+++ b/src/renderer/components/markdown-viewer/markdown-viewer.tsx
@@ -34,4 +34,4 @@ export class MarkdownViewer extends Component<Props> {
       />
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/radio/index.ts b/src/renderer/components/radio/index.ts
index 577923ef9c..0df0f30e50 100644
--- a/src/renderer/components/radio/index.ts
+++ b/src/renderer/components/radio/index.ts
@@ -1 +1 @@
-export * from "./radio";
\ No newline at end of file
+export * from "./radio";
diff --git a/src/renderer/components/resource-metrics/index.ts b/src/renderer/components/resource-metrics/index.ts
index 5438f760b4..a50f74ea8e 100644
--- a/src/renderer/components/resource-metrics/index.ts
+++ b/src/renderer/components/resource-metrics/index.ts
@@ -1,2 +1,2 @@
 export * from "./resource-metrics";
-export * from "./resource-metrics-text";
\ No newline at end of file
+export * from "./resource-metrics-text";
diff --git a/src/renderer/components/select/select.scss b/src/renderer/components/select/select.scss
index f3fd6e47b0..445e59d003 100644
--- a/src/renderer/components/select/select.scss
+++ b/src/renderer/components/select/select.scss
@@ -3,11 +3,9 @@
 
 html {
   $menuBackgroundColor: $contentColor;
-  $menuSelectedOptionBgc: $layoutBackground;
 
   --select-menu-bgc: #{$menuBackgroundColor};
   --select-menu-border-color: #{$halfGray};
-  --select-option-selected-bgc: #{$menuSelectedOptionBgc};
   --select-option-selected-color: #{$selectOptionHoveredColor};
   --select-option-focused-bgc: #{$colorInfo};
   --select-option-focused-color: #{$textColorAccent};
@@ -95,7 +93,7 @@ html {
       }
 
       &--is-selected {
-        background: var(--select-option-selected-bgc);
+        background: var(--menuSelectedOptionBgc);
         color: var(--select-option-selected-color);
       }
 
@@ -148,7 +146,6 @@ html {
     &.theme-light {
       --select-menu-bgc: white;
       --select-option-selected-color: $textColorSecondary;
-      --select-option-selected-bgc: $textColorSecondary;
 
       .Select {
         &__multi-value {
diff --git a/src/renderer/components/slider/index.ts b/src/renderer/components/slider/index.ts
index bc79daa3ff..67c45bb063 100644
--- a/src/renderer/components/slider/index.ts
+++ b/src/renderer/components/slider/index.ts
@@ -1 +1 @@
-export * from "./slider";
\ No newline at end of file
+export * from "./slider";
diff --git a/src/renderer/components/status-brick/index.ts b/src/renderer/components/status-brick/index.ts
index e16a2a8093..cc6d3e8879 100644
--- a/src/renderer/components/status-brick/index.ts
+++ b/src/renderer/components/status-brick/index.ts
@@ -1 +1 @@
-export * from "./status-brick";
\ No newline at end of file
+export * from "./status-brick";
diff --git a/src/renderer/components/status-brick/status-brick.tsx b/src/renderer/components/status-brick/status-brick.tsx
index 34c835c9fa..ced04acca4 100644
--- a/src/renderer/components/status-brick/status-brick.tsx
+++ b/src/renderer/components/status-brick/status-brick.tsx
@@ -19,4 +19,4 @@ export class StatusBrick extends React.Component<StatusBrickProps> {
       />
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/components/virtual-list/index.ts b/src/renderer/components/virtual-list/index.ts
index 4e5b065f43..3fad81848e 100644
--- a/src/renderer/components/virtual-list/index.ts
+++ b/src/renderer/components/virtual-list/index.ts
@@ -1 +1 @@
-export * from "./virtual-list";
\ No newline at end of file
+export * from "./virtual-list";
diff --git a/src/renderer/components/wizard/index.ts b/src/renderer/components/wizard/index.ts
index b217e311a9..da693bd87f 100644
--- a/src/renderer/components/wizard/index.ts
+++ b/src/renderer/components/wizard/index.ts
@@ -1 +1 @@
-export * from "./wizard";
\ No newline at end of file
+export * from "./wizard";
diff --git a/src/renderer/hooks/useInterval.ts b/src/renderer/hooks/useInterval.ts
index d195fa279f..7ab604511b 100644
--- a/src/renderer/hooks/useInterval.ts
+++ b/src/renderer/hooks/useInterval.ts
@@ -16,4 +16,4 @@ export function useInterval(callback: () => void, delay: number) {
 
     return () => clearInterval(id);
   }, [delay]);
-}
\ No newline at end of file
+}
diff --git a/src/renderer/hooks/useOnUnmount.ts b/src/renderer/hooks/useOnUnmount.ts
index 5af04e39b1..a8b6fdd1b4 100644
--- a/src/renderer/hooks/useOnUnmount.ts
+++ b/src/renderer/hooks/useOnUnmount.ts
@@ -2,4 +2,4 @@ import { useEffect } from "react";
 
 export function useOnUnmount(callback: () => void) {
   useEffect(() => callback, []);
-}
\ No newline at end of file
+}
diff --git a/src/renderer/hooks/useStorage.ts b/src/renderer/hooks/useStorage.ts
index 2af730fec8..97b0588d29 100644
--- a/src/renderer/hooks/useStorage.ts
+++ b/src/renderer/hooks/useStorage.ts
@@ -10,4 +10,4 @@ export function useStorage<T>(key: string, initialValue?: T, options?: IStorageH
   };
 
   return [storageValue, setValue] as [T, (value: T) => void];
-}
\ No newline at end of file
+}
diff --git a/src/renderer/navigation/events.ts b/src/renderer/navigation/events.ts
index 971465706d..1766a1e0d3 100644
--- a/src/renderer/navigation/events.ts
+++ b/src/renderer/navigation/events.ts
@@ -28,4 +28,4 @@ export function bindEvents() {
   subscribeToBroadcast("renderer:reload", () => {
     location.reload();
   });
-}
\ No newline at end of file
+}
diff --git a/src/renderer/navigation/helpers.ts b/src/renderer/navigation/helpers.ts
index 378f6edb96..0eda77c629 100644
--- a/src/renderer/navigation/helpers.ts
+++ b/src/renderer/navigation/helpers.ts
@@ -33,4 +33,4 @@ export function getMatchedClusterId(): string {
   });
 
   return matched?.params.clusterId;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/navigation/index.ts b/src/renderer/navigation/index.ts
index 70959c2dbd..94930fc994 100644
--- a/src/renderer/navigation/index.ts
+++ b/src/renderer/navigation/index.ts
@@ -5,4 +5,4 @@ import { bindEvents } from "./events";
 export * from "./history";
 export * from "./helpers";
 
-bindEvents();
\ No newline at end of file
+bindEvents();
diff --git a/src/renderer/themes/lens-dark.json b/src/renderer/themes/lens-dark.json
index 2cd16aec42..4a7a0f2f70 100644
--- a/src/renderer/themes/lens-dark.json
+++ b/src/renderer/themes/lens-dark.json
@@ -65,6 +65,7 @@
     "dockEditorKeyword": "#ffffff",
     "dockEditorComment": "#808080",
     "dockEditorActiveLineBackground": "#3a3d41",
+    "dockBadgeBackground": "#36393e",
     "logsBackground": "#000000",
     "logsForeground": "#ffffff",
     "logRowHoverBackground": "#35373a",
@@ -114,6 +115,7 @@
     "lineProgressBackground": "#414448",
     "radioActiveBackground": "#36393e",
     "menuActiveBackground": "#36393e",
+    "menuSelectedOptionBgc": "#36393e",
     "scrollBarColor": "#5f6064"
   }
 }
diff --git a/src/renderer/themes/lens-light.json b/src/renderer/themes/lens-light.json
index d5740f1505..f59d3c9555 100644
--- a/src/renderer/themes/lens-light.json
+++ b/src/renderer/themes/lens-light.json
@@ -59,13 +59,14 @@
     "colorVague": "#ededed",
     "colorTerminated": "#9dabb5",
     "dockHeadBackground": "#e8e8e8",
-    "dockInfoBackground": "#e8e8e8",
+    "dockInfoBackground": "#f3f3f3",
     "dockInfoBorderColor": "#c9cfd3",
     "dockEditorBackground": "#24292e",
     "dockEditorTag": "#8e97a3",
     "dockEditorKeyword": "#ffffff",
     "dockEditorComment": "#808080",
     "dockEditorActiveLineBackground": "#3a3d41",
+    "dockBadgeBackground": "#dedede",
     "logsBackground": "#24292e",
     "logsForeground": "#ffffff",
     "logRowHoverBackground": "#35373a",
@@ -115,6 +116,7 @@
     "lineProgressBackground": "#e8e8e8",
     "radioActiveBackground": "#f1f1f1",
     "menuActiveBackground": "#e8e8e8",
+    "menuSelectedOptionBgc": "#e8e8e8",
     "scrollBarColor": "#bbbbbb",
     "canvasBackground": "#24292e"
   }
diff --git a/src/renderer/themes/theme-vars.scss b/src/renderer/themes/theme-vars.scss
index b2953d3f64..6b556bdc88 100644
--- a/src/renderer/themes/theme-vars.scss
+++ b/src/renderer/themes/theme-vars.scss
@@ -67,6 +67,7 @@ $helmDescriptionPreColor: var(--helmDescriptionPreColor);
 $dockHeadBackground: var(--dockHeadBackground);
 $dockInfoBackground: var(--dockInfoBackground);
 $dockInfoBorderColor: var(--dockInfoBorderColor);
+$dockBadgeBackground: var(--dockBadgeBackground);
 
 // Terminal
 $terminalBackground: var(--terminalBackground);
@@ -129,4 +130,5 @@ $filterAreaBackground: var(--filterAreaBackground);
 $selectOptionHoveredColor: var(--selectOptionHoveredColor);
 $lineProgressBackground: var(--lineProgressBackground);
 $radioActiveBackground: var(--radioActiveBackground);
-$menuActiveBackground: var(--menuActiveBackground);
\ No newline at end of file
+$menuActiveBackground: var(--menuActiveBackground);
+$menuSelectedOptionBgc: var(--menuSelectedOptionBgc);
\ No newline at end of file
diff --git a/src/renderer/utils/__tests__/metricUnitsToNumber.test.ts b/src/renderer/utils/__tests__/metricUnitsToNumber.test.ts
index e94c2f3b67..a22aa46790 100644
--- a/src/renderer/utils/__tests__/metricUnitsToNumber.test.ts
+++ b/src/renderer/utils/__tests__/metricUnitsToNumber.test.ts
@@ -12,4 +12,4 @@ describe("metricUnitsToNumber tests", () => {
   test("with m suffix", () => {
     expect(metricUnitsToNumber("124m")).toStrictEqual(124000000);
   });
-});
\ No newline at end of file
+});
diff --git a/src/renderer/utils/formatDuration.ts b/src/renderer/utils/formatDuration.ts
index 8864aba393..87da6cfa64 100644
--- a/src/renderer/utils/formatDuration.ts
+++ b/src/renderer/utils/formatDuration.ts
@@ -83,4 +83,4 @@ function getMeaningfulValues(values: number[], suffixes: string[], separator = "
     .filter(([dur]) => dur > 0)
     .map(([dur, suf]) => dur + suf)
     .join(separator);
-}
\ No newline at end of file
+}
diff --git a/src/renderer/utils/jsonPath.ts b/src/renderer/utils/jsonPath.ts
index ea31ffa80e..79075500f9 100644
--- a/src/renderer/utils/jsonPath.ts
+++ b/src/renderer/utils/jsonPath.ts
@@ -32,4 +32,4 @@ function convertToIndexNotation(key: string, firstItem = false) {
 
     return `${prefix}${key}`;
   }
-}
\ No newline at end of file
+}
diff --git a/types/command-exists.d.ts b/types/command-exists.d.ts
index b5375ae390..634d2a035e 100644
--- a/types/command-exists.d.ts
+++ b/types/command-exists.d.ts
@@ -13,4 +13,4 @@ declare function commandExists(
 
 declare namespace commandExists {
     function sync(commandName: string): boolean;
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index dc50f585ef..4cfa01fdf4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12141,10 +12141,10 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-env@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-3.0.0.tgz#42484ebd0798ee321ba69f6151f2aeab13fde1d4"
-  integrity sha512-zE0lGldowbCLnnorLnOUO6gLSwEoW4u+qWcEV1HH2qje5sIg0PvBd+8ro74EgSZv0MBEP2dROD6vSKhGDbUIMQ==
+shell-env@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-3.0.1.tgz#515a62f6cbd5e139365be2535745e8e53438ce77"
+  integrity sha512-b09fpMipAQ9ObwvIeKoQFLDXcEcCpYUUZanlad4OYQscw2I49C/u97OPQg9jWYo36bRDn62fbe07oWYqovIvKA==
   dependencies:
     default-shell "^1.0.1"
     execa "^1.0.0"