diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.html b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
index cba134ecf..02ff3865f 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.html
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
@@ -11,12 +11,18 @@
                 </span>
             </button>
         </li>
-        <li class="nav-item">
+        <li class="nav-item" *ngIf="!isLastPage">
             <h3 class="tag tag-primary">
                 <span class="index">{{ currentPage.index }}</span>
                 <i18n-text [key]="currentPage.path"></i18n-text>
             </h3>
         </li>
+        <li class="nav-item" *ngIf="isLastPage">
+            <h3 class="tag tag-primary">
+                <span class="index"><i class="fa fa-check"></i></span>
+                <i18n-text [key]="currentPage.path"></i18n-text>
+            </h3>
+        </li>
         <li class="nav-item" *ngIf="!isLastPage">
             <button class="nav-link next btn clearfix" (click)="onNext.emit(nextPage.index)" [disabled]="wizardIsInvalid$ | async" [attr.aria-label]="nextPage.path" role="button">
                 <span class="label pull-left">
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index ed670ea60..cf59c451f 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -21,7 +21,11 @@ <h3 class="tag tag-primary">
                         <ng-container *ngSwitchCase="icons.CHECK"><i class="fa fa-check"></i></ng-container>
                     </ng-container>
                 </span>
-                {{ (current$ | async).index }}. {{ (current$ | async).label }}
+                <ng-container [ngSwitch]="currentIcon$ | async">
+                    <ng-container *ngSwitchDefault>{{ (current$ | async).index }}. {{ (current$ | async).label }}</ng-container>
+                    <ng-container *ngSwitchCase="icons.CHECK">{{ (current$ | async).label }}</ng-container>
+                </ng-container>
+                <!-- {{ (current$ | async).index }}. {{ (current$ | async).label }} -->
             </h3>
         </li>
         <li class="nav-item" *ngIf="(next$ | async)">