diff --git a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.html b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.html
index 195ee73ad..269ea3e3e 100644
--- a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.html
+++ b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.html
@@ -15,11 +15,9 @@
             (click)="downloadChart()">{{'HELM_CHART.DOWNLOAD' | translate}}</button>
         </div>
     </div>
-    <div class="detail-loading" *ngIf="loading">
-        <span class="spinner">
-            Loading...
-        </span>
-    </div>
+    <span *ngIf="loading" class="spinner spinner-lg detail-loading">
+        Loading...
+    </span>
     <div *ngIf="!loading && isChartExist">
         <clr-tabs>
             <clr-tab>
diff --git a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.scss b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.scss
index aadf7da32..750199a49 100644
--- a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.scss
+++ b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail.component.scss
@@ -13,8 +13,9 @@
     position: absolute;
     top: 0;
     left: 0;
-    right:0;
-    bottom:0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
     width: 108px !important;
     height: 108px !important;
 }
\ No newline at end of file
diff --git a/src/ui_ng/lib/src/helm-chart/helm-chart.component.html b/src/ui_ng/lib/src/helm-chart/helm-chart.component.html
index 0b400ea78..53d492ff7 100644
--- a/src/ui_ng/lib/src/helm-chart/helm-chart.component.html
+++ b/src/ui_ng/lib/src/helm-chart/helm-chart.component.html
@@ -69,9 +69,9 @@
                 </div>
             </a>
         </div>
-        <div *ngIf="loading" [ngClass]="{'central-block-loading': isFirstPage, 'central-block-loading-more': !isFirstPage}">
+        <div *ngIf="loading">
             <span class="vertical-helper"></span>
-            <div class="spinner"></div>
+            <span class="spinner"></span>
         </div>
     </div>
     <clr-modal [(clrModalOpen)]="isUploadModalOpen" [clrModalStaticBackdrop]="true">
@@ -89,11 +89,11 @@
                     </div>
                 </section>
                 <button type="submit" class="btn btn-secondary" [disabled]="isUploading">
-                    <span *ngIf="!isUploading">{{'HELM_CHART.UPLOAD' | translate}}</span>
-                    <span *ngIf="isUploading" class="spinner spinner-inline">
-                        Loading...
-                    </span>
+                    <span>{{'HELM_CHART.UPLOAD' | translate}}</span>
                 </button>
+                <span *ngIf="isUploading" class="spinner spinner-inline">
+                    Loading...
+                </span>
             </form>
         </div>
     </clr-modal>
diff --git a/src/ui_ng/lib/src/helm-chart/helm-chart.component.scss b/src/ui_ng/lib/src/helm-chart/helm-chart.component.scss
index fd76d059b..042fc04bc 100644
--- a/src/ui_ng/lib/src/helm-chart/helm-chart.component.scss
+++ b/src/ui_ng/lib/src/helm-chart/helm-chart.component.scss
@@ -59,10 +59,4 @@
     display: inline-block;
     height: 100%;
     vertical-align: middle;
-}
-
-.spinner {
-    width: 100px;
-    height: 100px;
-    vertical-align: middle;
 }
\ No newline at end of file
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 fe03f7579..b1e1d4754 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
@@ -106,9 +106,9 @@
                 </div>
             </a>
         </div>
-        <div *ngIf="loading" [ngClass]="{'central-block-loading': isFirstPage, 'central-block-loading-more': !isFirstPage}">
+        <div *ngIf="loading">
             <span class="vertical-helper"></span>
-            <div class="spinner"></div>
+            <span class="spinner"></span>
         </div>
     </div>
     <clr-modal [(clrModalOpen)]="isUploadModalOpen" [clrModalStaticBackdrop]="true">
@@ -126,11 +126,11 @@
                     </div>
                 </section>
                 <button type="submit" class="btn btn-secondary" [disabled]="isUploading">
-                    <span *ngIf="!isUploading">{{'HELM_CHART.UPLOAD' | translate}}</span>
-                    <span *ngIf="isUploading" class="spinner spinner-inline">
-                        Loading...
-                    </span>
+                    <span>{{'HELM_CHART.UPLOAD' | translate}}</span>
                 </button>
+                <span *ngIf="isUploading" class="spinner spinner-inline">
+                    Loading...
+                </span>
             </form>
         </div>
     </clr-modal>
diff --git a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.scss b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.scss
index a6d53d863..cf2aae7d6 100644
--- a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.scss
+++ b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.scss
@@ -1,3 +1,5 @@
+@import "../../mixin";
+
 .title-container {
     display: flex;
     .chart-name-span {
@@ -14,10 +16,7 @@
     .toolbar {
         overflow: hidden;
         .rightPos {
-            position: absolute;
-            z-index: 100;
-            right: 35px;
-            margin-top: 4px;
+            @include grid-left-top-pos;
             .filter-divider {
                 display: inline-block;
                 height: 16px;
@@ -87,10 +86,4 @@
     display: inline-block;
     height: 100%;
     vertical-align: middle;
-}
-
-.spinner {
-    width: 100px;
-    height: 100px;
-    vertical-align: middle;
 }
\ No newline at end of file