diff --git a/integration/__tests__/cluster-pages.tests.ts b/integration/__tests__/cluster-pages.tests.ts
index bd31a80102..f54565e1a8 100644
--- a/integration/__tests__/cluster-pages.tests.ts
+++ b/integration/__tests__/cluster-pages.tests.ts
@@ -74,7 +74,7 @@ const commonPageTests: CommonPageTest[] = [{
   page: {
     name: "Cluster",
     href: "/overview",
-    expectedSelector: "div.ClusterOverview div.label",
+    expectedSelector: "div[data-testid='cluster-overview-page'] div.label",
     expectedText: "CPU"
   }
 },
diff --git a/src/renderer/components/+cluster/cluster-issues.module.css b/src/renderer/components/+cluster/cluster-issues.module.css
index b3c7388552..fc421f1401 100644
--- a/src/renderer/components/+cluster/cluster-issues.module.css
+++ b/src/renderer/components/+cluster/cluster-issues.module.css
@@ -66,5 +66,9 @@
       color: var(--textColorAccent);
       font-weight: bold;
     }
+
+    .allGood {
+      color: white;
+    }
   }
 }
diff --git a/src/renderer/components/+cluster/cluster-issues.tsx b/src/renderer/components/+cluster/cluster-issues.tsx
index a5e09370c7..6165fde8bd 100644
--- a/src/renderer/components/+cluster/cluster-issues.tsx
+++ b/src/renderer/components/+cluster/cluster-issues.tsx
@@ -149,7 +149,7 @@ export class ClusterIssues extends React.Component<Props> {
     if (!warnings.length) {
       return (
         <div className={cssNames(styles.noIssues, "flex column box grow gaps align-center justify-center")}>
-          <div><Icon style={{ color: "white" }} material="check" big sticker/></div>
+          <div><Icon className={styles.allGood} material="check" big sticker/></div>
           <div className="ok-title">No issues found</div>
           <span>Everything is fine in the Cluster</span>
         </div>
diff --git a/src/renderer/components/+cluster/cluster-overview.tsx b/src/renderer/components/+cluster/cluster-overview.tsx
index d10908b417..b4fa25da45 100644
--- a/src/renderer/components/+cluster/cluster-overview.tsx
+++ b/src/renderer/components/+cluster/cluster-overview.tsx
@@ -101,7 +101,7 @@ export class ClusterOverview extends React.Component {
 
     return (
       <TabLayout>
-        <div className={styles.ClusterOverview}>
+        <div className={styles.ClusterOverview} data-testid="cluster-overview-page">
           {this.renderClusterOverview(isLoaded, isMetricHidden)}
         </div>
       </TabLayout>