diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
index 67cec6ed5..feae8fea8 100644
--- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
+++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
@@ -319,8 +319,7 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
           if (!data.value.deleted) {
             count++;
             this.filterLabelInfo.push(data.value);
-          }
-          if (data.value.deleted) {
+          } else {
             this.deletedLabelCount++;
             delLabel += data.value.name + ',';
           }
diff --git a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html
index 43324a32c..fe03f7579 100644
--- a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html
+++ b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html
@@ -54,8 +54,10 @@
                 <clr-dg-column>{{'HELM_CHART.CREATED' | translate }}</clr-dg-column>
                 <clr-dg-row *ngFor="let v of chartVersions" [clrDgItem]="v">
                     <clr-dg-cell>
-                        <span class="list-img"><img [src]="getImgLink(v)"/></span>
-                        <a href="javascript:void(0)" (click)="onVersionClick(v)">{{ v.version }}</a>
+                        <span class="list-img">
+                            <img  [src]="v.icon ?v.icon:chartDefaultIcon"  (error)="getDefaultIcon(v);" />
+                        </span>
+                        <a href="#" (click)="onVersionClick(v)">{{ v.version }}</a>
                     </clr-dg-cell>
                     <clr-dg-cell>{{ v.engine }}</clr-dg-cell>
                     <clr-dg-cell>{{ getMaintainerString(v.maintainers) }}</clr-dg-cell>
diff --git a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts
index b9172cc2c..dfa3fd614 100644
--- a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts
+++ b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts
@@ -51,9 +51,11 @@ export class ChartVersionComponent implements OnInit {
   @Input() roleName: string;
   @Input() hasSignedIn: boolean;
   @Input() hasProjectAdminRole: boolean;
+  @Input() chartDefaultIcon: string = DefaultHelmIcon;
   @Output() versionClickEvt = new EventEmitter<string>();
   @Output() backEvt = new EventEmitter<any>();
 
+
   lastFilteredVersionName: string;
   chartVersions: HelmChartVersion[] = [];
   versionsCopy: HelmChartVersion[] = [];
@@ -288,11 +290,8 @@ export class ChartVersionComponent implements OnInit {
     }
   }
 
-  getImgLink(v: HelmChartVersion) {
-    if (v.icon) {
-      return v.icon;
-    } else {
-      return DefaultHelmIcon;
-    }
+
+  getDefaultIcon(v: HelmChartVersion) {
+    v.icon = this.chartDefaultIcon;
   }
 }