diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx
index 1e24845b5a..dd97e06b0a 100644
--- a/src/renderer/components/+entity-settings/entity-settings.tsx
+++ b/src/renderer/components/+entity-settings/entity-settings.tsx
@@ -101,6 +101,7 @@ export class EntitySettings extends React.Component<Props> {
             colorHash={`${this.entity.metadata.name}-${this.entity.metadata.source}`}
             src={this.entity.spec.icon?.src}
             className={styles.settingsAvatar}
+            size={40}
           />
           <div className={styles.entityName}>
             {this.entity.metadata.name}
diff --git a/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx b/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
index 980ba88633..527d67c32c 100644
--- a/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
@@ -24,10 +24,10 @@ import type { Cluster } from "../../../../main/cluster";
 import { boundMethod } from "../../../utils";
 import { observable } from "mobx";
 import { observer } from "mobx-react";
-import { HotbarIcon } from "../../hotbar/hotbar-icon";
 import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { FilePicker, OverSizeLimitStyle } from "../../file-picker";
 import { MenuActions, MenuItem } from "../../menu";
+import { Avatar } from "../../avatar/avatar";
 
 enum GeneralInputStatus {
   CLEAN = "clean",
@@ -86,10 +86,9 @@ export class ClusterIconSetting extends React.Component<Props> {
             <FilePicker
               accept="image/*"
               label={
-                <HotbarIcon
-                  uid={entity.metadata.uid}
+                <Avatar
+                  colorHash={`${entity.metadata.name}-${entity.metadata.source}`}
                   title={entity.metadata.name}
-                  source={entity.metadata.source}
                   src={entity.spec.icon?.src}
                   size={53}
                 />