diff --git a/admin-ui/src/app/core/header/header.component.html b/admin-ui/src/app/core/header/header.component.html
index 6e3653fd..232b6e44 100644
--- a/admin-ui/src/app/core/header/header.component.html
+++ b/admin-ui/src/app/core/header/header.component.html
@@ -16,8 +16,8 @@
         alt="Logo"/></span
     >&nbsp;
     <span [ngStyle]="{ display: screenResize > 840 ? 'inline-block' : 'none' }"
-      ><b class="mosip-text">MOSIP</b
-      ><b class="version-txt"> {{ 'headermessage.vesion' | translate }} : {{ appVersion }}</b></span
+      ><strong class="mosip-text">MOSIP</strong
+      ><strong class="version-txt"> {{ 'headermessage.vesion' | translate }} : {{ appVersion }}</strong></span
     >
   </div>
   <div class="zone">
diff --git a/admin-ui/src/app/features/bulkupload/masterdataupload/create/create.component.css b/admin-ui/src/app/features/bulkupload/masterdataupload/create/create.component.css
index 8ff31edf..6046f05e 100644
--- a/admin-ui/src/app/features/bulkupload/masterdataupload/create/create.component.css
+++ b/admin-ui/src/app/features/bulkupload/masterdataupload/create/create.component.css
@@ -113,7 +113,6 @@
    align-items: center;
    border: dashed 1px #FF4081;
    margin-bottom: 1rem;
-   display: flex;
    flex-grow: 1;
    margin-left: 8px;
    width:25%;
diff --git a/admin-ui/src/app/features/bulkupload/packetdataupload/create/create.component.css b/admin-ui/src/app/features/bulkupload/packetdataupload/create/create.component.css
index 8ff31edf..6046f05e 100644
--- a/admin-ui/src/app/features/bulkupload/packetdataupload/create/create.component.css
+++ b/admin-ui/src/app/features/bulkupload/packetdataupload/create/create.component.css
@@ -113,7 +113,6 @@
    align-items: center;
    border: dashed 1px #FF4081;
    margin-bottom: 1rem;
-   display: flex;
    flex-grow: 1;
    margin-left: 8px;
    width:25%;
diff --git a/admin-ui/src/app/features/download-card/download-card/download-card.component.html b/admin-ui/src/app/features/download-card/download-card/download-card.component.html
index 9b3c917d..fedddae9 100644
--- a/admin-ui/src/app/features/download-card/download-card/download-card.component.html
+++ b/admin-ui/src/app/features/download-card/download-card/download-card.component.html
@@ -2,10 +2,17 @@
     <p class="packet-status__header-text">{{'download-card.header' | translate}}</p>
     <mat-card style="border-radius: 0;">
         <table style="width: 100%;">
-            <tr>
-                <td style="width: 50%;"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.text' | translate}}</span></strong></td>
-                <td style="width: 50%;text-align: right;" *ngIf="searchLimitCount"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.searchLimit' | translate}}&nbsp;{{searchLimitCount}}&nbsp;{{'download-card.outof' | translate}}&nbsp;{{searchLimitMaxCount}}&nbsp;{{'download-card.dailylimit' | translate}}</span></strong></td>
-            </tr>
+            <thead>
+                <tr>
+                    <td style="width: 50%;"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.text' | translate}}</span></strong></td>
+                    <td style="width: 50%;text-align: right;" *ngIf="searchLimitCount"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.searchLimit' | translate}}&nbsp;{{searchLimitCount}}&nbsp;{{'download-card.outof' | translate}}&nbsp;{{searchLimitMaxCount}}&nbsp;{{'download-card.dailylimit' | translate}}</span></strong></td>
+                </tr>
+                <tr>
+                    <td colspan="2">
+                        <span style="font-family: Roboto, sans-serif; margin-left: 30px; font-size: 10px;">Download Card</span>
+                    </td>
+                </tr>
+            </thead>
         </table><br>
         <mat-form-field class="packet-status__input-placer">
             <input matInput placeholder="Enter Registration ID" [(ngModel)]="id"/>
@@ -17,10 +24,27 @@
         <div class="packet-status__details-container" *ngIf="data">
             <div>
                 <table>
+                    <caption>Download Card Information</caption>
+                    <thead>
+                        <tr>
+                            <th>Download Card DOB</th>
+                            <th>Download Card Verify</th>
+                        </tr>
+                    </thead>
                     <tr>
-                        <td><img style="width: 150px;height: 200px;" [src]="applicantPhoto"></td>
+                        <td><img style="width: 150px;height: 200px;" [src]="applicantPhoto" alt="Applicant Photo"></td>
                         <td>
                             <table>
+                                <caption>Download Card Details</caption>
+                                <tr>
+                                    <th>{{ 'download-card.dob' | translate }}</th>
+                                </tr>
+                                <tr>
+                                    <th>{{ data.dateOfBirth }}</th>
+                                </tr>
+                                <tr>
+                                    <th>{{ 'download-card.verify' | translate }}</th>
+                                </tr>
                                 <tr>
                                     <td><strong>{{'download-card.dob' | translate}} :</strong> {{data.dateOfBirth}}</td>
                                 </tr>
@@ -34,6 +58,7 @@
                                           <mat-button-toggle  (click)="captureSelection('false')" value="flase"><mat-icon style="color:red;">clear</mat-icon>&nbsp;&nbsp;{{'download-card.reject' | translate}}</mat-button-toggle>
                                         </mat-button-toggle-group>
                                     </td>
+                                    <th>Action</th>
                                 </tr>
                                 <tr>
                                     <td>
diff --git a/admin-ui/src/app/features/masterdata/document-category-mapping/document-category-mapping.component.html b/admin-ui/src/app/features/masterdata/document-category-mapping/document-category-mapping.component.html
index 0c7d32b2..624f2634 100644
--- a/admin-ui/src/app/features/masterdata/document-category-mapping/document-category-mapping.component.html
+++ b/admin-ui/src/app/features/masterdata/document-category-mapping/document-category-mapping.component.html
@@ -32,9 +32,9 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
                                     <li class="list" [ngClass]="{'active': selectedItem === categoryList?.code}"
                                         (click)="onCategory(categoryList)">
                                         <span>{{categoryList?.name}}({{categoryList?.code}})</span>
-                                        <span><i class="material-icons">
+                                        <span><em class="material-icons">
                                                 keyboard_arrow_right
-                                            </i></span></li>
+                                        </em></span></li>
                                 </ng-container>
                             </ul>
                         </div>
@@ -47,9 +47,9 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
                                 <ng-container *ngFor="let mappedItem of mappedDocList; let i = index">
                                     <li class="list">
                                         <span>{{mappedItem?.name}}</span>
-                                        <span><i class="material-icons" (click)="onClose(mappedItem, i)">
+                                        <span><em class="material-icons" (click)="onClose(mappedItem, i)">
                                                 close
-                                            </i></span></li>
+                                        </em></span></li>
                                 </ng-container>
                             </ul>
                         </div>
@@ -62,9 +62,9 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
                                 <ng-container *ngFor="let unMappedItem of unMappedDocList; let i = index">
                                     <li class="list">
                                         <span>{{unMappedItem?.name}}</span>
-                                        <span><i class="material-icons" (click)="onAdd(unMappedItem, i)">
+                                        <span><em class="material-icons" (click)="onAdd(unMappedItem, i)">
                                                 add
-                                            </i></span></li>
+                                        </em></span></li>
                                 </ng-container>
                             </ul>
                         </div>
diff --git a/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts b/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts
index ad493b14..d5819610 100644
--- a/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts
+++ b/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts
@@ -81,19 +81,18 @@ export class ListViewComponent implements OnDestroy {
     }
   }
 
-  loadBlacklistedWords(): void {
-    new Promise(async (resolve, reject) => {
-      const data = [];
-      await this.getMasterDataTypeValues('all').then(response => {
-        if (response['data']) {
-          data.push(...response['data']);
-          console.log(response);
-        }
-      });
-      this.masterData = data;      
-      //this.paginatorOptions.totalEntries = this.masterData.length;
-      resolve(true);
-    });
+  async loadBlacklistedWords(): Promise<void> {
+    try {
+      const response = await this.getMasterDataTypeValues('all');
+      if (response && response['data']) {
+        this.masterData = response['data'];
+        console.log(response);
+      }
+      // this.paginatorOptions.totalEntries = this.masterData.length;
+    } catch (error) {
+      console.error('Error loading blacklisted words:', error);
+      throw error;
+    }
   }
 
   loadData() {
diff --git a/admin-ui/src/app/features/masterdata/master-data/master-data.component.html b/admin-ui/src/app/features/masterdata/master-data/master-data.component.html
index ecb8b830..a1df5a03 100644
--- a/admin-ui/src/app/features/masterdata/master-data/master-data.component.html
+++ b/admin-ui/src/app/features/masterdata/master-data/master-data.component.html
@@ -9,14 +9,14 @@
                 <div class="sub-item1">
                     <mat-card>
                         <mat-card-header class="header">
-                            <b>{{'masterData.common' | translate}}</b>
+                            <strong>{{'masterData.common' | translate}}</strong>
                         </mat-card-header>
                         <ng-container *ngFor="let itemList of masterDataCommonList; let i = index">
                             <mat-card-content class="content" [style.marginTop.px]="i === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
                                 <span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
-                                <span style="text-align: right"><i class="material-icons">
+                                <span style="text-align: right"><em class="material-icons">
                                         {{arrowDirection}}
-                                    </i></span>
+                                </em></span>
                             </mat-card-content>
                         </ng-container>
                     </mat-card>
@@ -24,14 +24,14 @@
                 <div class="sub-item2">
                     <mat-card >
                         <mat-card-header class="header">
-                            <b>{{'masterData.dynamicField' | translate}}</b>
+                            <strong>{{'masterData.dynamicField' | translate}}</strong>
                         </mat-card-header>
                         <ng-container>
                             <mat-card-content class="content" (click)="dynamicFeildAdd()" id="createDynamicField">
-                                <span style="margin-top: 5px; margin-left: 5px;"><b>{{'masterData.createDynamicField' | translate}}</b></span>
-                                <span style="text-align: right"><i class="material-icons">
+                                <span style="margin-top: 5px; margin-left: 5px;"><strong>{{'masterData.createDynamicField' | translate}}</strong></span>
+                                <span style="text-align: right"><em class="material-icons">
                                         add
-                                    </i></span>
+                                </em></span>
                             </mat-card-content>
                         </ng-container>
                         <ng-container *ngFor="let itemList of dynamicfieldDistinctValue; let i = index">
@@ -40,9 +40,9 @@
                                     <span *ngIf="itemList.description">{{itemList.description}}</span>
                                     <span *ngIf="!itemList.description">{{itemList.name}}</span>
                                 </span>
-                                <span style="text-align: right"><i class="material-icons">
+                                <span style="text-align: right"><em class="material-icons">
                                         {{arrowDirection}}
-                                    </i></span>
+                                </em></span>
                             </mat-card-content>
                         </ng-container>
                     </mat-card >
@@ -54,14 +54,14 @@
                 <div class="sub-item1">
                     <mat-card >
                         <mat-card-header class="header">
-                            <b>{{'masterData.device-definition' | translate}}</b>
+                            <strong>{{'masterData.device-definition' | translate}}</strong>
                         </mat-card-header>
                         <ng-container *ngFor="let itemList of masterDataDeviceList; let j = index">
                             <mat-card-content class="content" [style.marginTop.px]="j === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
                                 <span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
-                                <span style="text-align: right"><i class="material-icons">
+                                <span style="text-align: right"><em class="material-icons">
                                         {{arrowDirection}}
-                                    </i></span>
+                                </em></span>
                             </mat-card-content>
                         </ng-container>
                     </mat-card >
@@ -69,14 +69,14 @@
                 <div class="sub-item2">
                     <mat-card>
                         <mat-card-header class="header">
-                            <b>{{'masterData.machine-definition' | translate}}</b>
+                            <strong>{{'masterData.machine-definition' | translate}}</strong>
                         </mat-card-header>
                         <ng-container *ngFor="let itemList of masterDataMachineList; let k = index">
                             <mat-card-content class="content" [style.marginTop.px]="k === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
                                 <span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
-                                <span style="text-align: right"><i class="material-icons">
+                                <span style="text-align: right"><em class="material-icons">
                                         {{arrowDirection}}
-                                    </i></span>
+                                </em></span>
                             </mat-card-content>
                         </ng-container>
                     </mat-card>
@@ -84,14 +84,14 @@
                 <div class="sub-item3">
                     <mat-card>
                         <mat-card-header class="header">
-                            <b>{{'masterData.document-definition' | translate}}</b>
+                            <strong>{{'masterData.document-definition' | translate}}</strong>
                         </mat-card-header>
                         <ng-container *ngFor="let itemList of masterDataDocumentList; let l = index">
                             <mat-card-content class="content" [style.marginTop.px]="l === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
                                 <span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
-                                <span style="text-align: right"><i class="material-icons">
+                                <span style="text-align: right"><em class="material-icons">
                                         {{arrowDirection}}
-                                    </i></span>
+                                </em></span>
                             </mat-card-content>
                         </ng-container>
                     </mat-card>
diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
index db26a841..9621a872 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
@@ -10,7 +10,7 @@
                   (click)="openKeyboard('primary', primaryData.langCode)"
                   style="color: grey; cursor: pointer;"
                   [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"
-                  ><i class="material-icons">keyboard</i></span
+                  ><em class="material-icons">keyboard</em></span
                 >
                 <hr />
                 <br /><br />
@@ -414,7 +414,7 @@
             <mat-divider [vertical]="true" [inset]="true"></mat-divider>
               <div *ngIf="showSecondaryForm" class="secondary-form" [dir]="secondaryLang==='ara' ? 'rtl' : 'ltr'">
                 <mat-form-field style="padding-bottom: 10px;">
-                <mat-label><b>{{ "center.selectLanguage" | translate }}</b></mat-label>
+                <mat-label><strong>{{ "center.selectLanguage" | translate }}</strong></mat-label>
                   <mat-select
                     id="secondaryLang"
                     [(value)]="secondaryLang"
@@ -435,7 +435,7 @@
                   (click)="openKeyboard('secondary', '')"
                   style="color: grey; cursor: pointer;"
                   [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"
-                  ><i class="material-icons">keyboard</i></span
+                  ><em class="material-icons">keyboard</em></span
                 >
                 <hr  [ngStyle]="isPrimaryLangRTL ? {'margin-top': '17px'} : {'margin-top': '0px'}"   />
                 <br /><br />
@@ -764,7 +764,7 @@
               matTooltip="{{ 'center.keyboard-tooltip' | translate }}"
               (click)="openKeyboard('primary','')"
               style="float: right; color: grey; cursor: pointer;"
-              ><i class="material-icons">keyboard</i></span
+              ><em class="material-icons">keyboard</em></span
             >
             <hr />
             <br /><br />
@@ -794,7 +794,7 @@
               matTooltip="{{languageNames['keyboard-tooltip'] | translate }}"
               (click)="openKeyboard('secondary', '')"
               style="float: right; color: grey; cursor: pointer;"
-              ><i class="material-icons">keyboard</i></span
+              ><em class="material-icons">keyboard</em></span
             >
             <hr />
             <br /><br />
diff --git a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html
index 669230a0..560eba2f 100644
--- a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html
+++ b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html
@@ -16,11 +16,11 @@
                 <table>
                     <caption>Packet Status Information</caption>
                     <tr>
-                        <th>{{'packet-status.id' | translate}}</th>
+                        <th id="registrationId">{{'packet-status.id' | translate}}</th>
                         <td><strong>{{data[0].registrationId}}</strong></td>
                     </tr>
                     <tr>
-                        <th>{{'packet-status.status' | translate}}</th>
+                        <th id="Status">{{'packet-status.status' | translate}}</th>
                         <td><strong>{{statusCheck}}</strong></td>
                     </tr>
                 </table>
@@ -29,17 +29,17 @@
                 <table>
                     <caption>Timeline</caption>
                     <tr (click)="viewMore()">
-                        <th *ngIf="!showTimeline">{{'packet-status.viewMore' | translate}}</th>
-                        <th *ngIf="showTimeline">{{'packet-status.viewLess' | translate}}</th>
+                        <th id="viewMore" *ngIf="!showTimeline">{{'packet-status.viewMore' | translate}}</th>
+                        <th id="viewLess" *ngIf="showTimeline">{{'packet-status.viewLess' | translate}}</th>
                         <td>
-                            <i *ngIf="!showTimeline" class="material-icons">keyboard_arrow_down</i>
-                            <i *ngIf="showTimeline" class="material-icons">keyboard_arrow_up</i>
+                            <em *ngIf="!showTimeline" class="material-icons">keyboard_arrow_down</em>
+                            <em *ngIf="showTimeline" class="material-icons">keyboard_arrow_up</em>
                         </td>
                     </tr>
                 </table>
                 <ul *ngIf="showTimeline">
                     <li *ngFor="let item of data" [ngClass]="item.statusCode === 'SUCCESS' || item.statusCode === 'PROCESSED' ? 'complete' : ''">
-                        <i [ngClass]="item.statusCode === 'IN_PROGRESS' ? 'dot hollow-dot' : item.statusCode === 'SUCCESS' || item.statusCode === 'PROCESSED' ? 'milestone-complete dot' : 'dot incomplete-hollow' "></i>
+                        <em [ngClass]="item.statusCode === 'IN_PROGRESS' ? 'dot hollow-dot' : item.statusCode === 'SUCCESS' || item.statusCode === 'PROCESSED' ? 'milestone-complete dot' : 'dot incomplete-hollow' "></em>
                         <h3><div *ngIf = "item.transactionTypeCode">{{item.transactionTypeCode.replace("_", " ")}}</div></h3>
                         <p *ngIf="item.statusCode === 'SUCCESS'">
                             {{serverMessage[item.subStatusCode]}},   <span *ngIf = "item.createdDateTimes">{{item.createdDateTimes | date:'medium':'+0530'}} </span>                      
@@ -57,7 +57,7 @@ <h3><div *ngIf = "item.transactionTypeCode">{{item.transactionTypeCode.replace("
                 <table>
                     <caption>Error Information</caption>
                     <tr>
-                        <th>Error Message</th>
+                        <th id="errorMessage">Error Message</th>
                     </tr>
                     <tr>
                         <td><strong>{{errorMessage}}</strong></td>
diff --git a/admin-ui/src/app/features/resources/center/create/create.component.html b/admin-ui/src/app/features/resources/center/create/create.component.html
index 063c39b0..425e3490 100644
--- a/admin-ui/src/app/features/resources/center/create/create.component.html
+++ b/admin-ui/src/app/features/resources/center/create/create.component.html
@@ -15,7 +15,7 @@
               (click)="openKeyboard('primary')" 
               style="color: grey; cursor: pointer;"
               [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}">
-              <i class="material-icons">keyboard</i></span>
+              <em class="material-icons">keyboard</em></span>
             <hr />
             <br /><br />
             <h3>{{ "center.center-details" | translate }}</h3>
@@ -505,7 +505,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
                   *ngIf="primary.exceptionalHolidays.value.length>=0 && data.exceptionHolidayDate!==null">
                   <span>{{ data.exceptionHolidayDate }}</span>
                   <div style="position: absolute; margin-left: 65px;margin-top: -18px;cursor: pointer;color: #FF4081;" (click)="deleteHoliday(i)">
-                    <i class="material-icons" [ngClass]="isPrimaryLangRTL ? 'icon-padding-right' : 'icon-padding-left'">cancel</i>
+                    <em class="material-icons" [ngClass]="isPrimaryLangRTL ? 'icon-padding-right' : 'icon-padding-left'">cancel</em>
                   </div>
                 </div>
               </ng-container>
diff --git a/admin-ui/src/app/features/resources/center/edit/edit.component.html b/admin-ui/src/app/features/resources/center/edit/edit.component.html
index e3351ac4..2f20a178 100644
--- a/admin-ui/src/app/features/resources/center/edit/edit.component.html
+++ b/admin-ui/src/app/features/resources/center/edit/edit.component.html
@@ -17,7 +17,7 @@
               (click)="openKeyboard('primary')" 
               style="color: grey; cursor: pointer;"
               [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}">
-              <i class="material-icons">keyboard</i></span>
+              <em class="material-icons">keyboard</em></span>
             <hr />
             <h3>{{ "center.center-details" | translate }}</h3>
             <div class="flex-display">
@@ -119,7 +119,7 @@ <h3>{{ "center.location-details" | translate }}</h3>
           <div *ngIf="secondaryLanguageLabels && secondaryLang && showSecondaryForm" [formGroup]="secondaryForm"
             [ngClass]="isSecondaryLangRTL ? 'secondary-form' : 'secondary-form-ltr'" [dir]="isSecondaryLangRTL ? 'rtl' : 'ltl'">
             <mat-form-field style="padding-bottom: 10px;">
-              <mat-label><b>{{ "center.selectLanguage" | translate }}</b></mat-label>
+              <mat-label><strong>{{ "center.selectLanguage" | translate }}</strong></mat-label>
               <mat-select formControlName="selectLanguage" id="selectLanguage"
                 (selectionChange)="handleChangeSecondaryLang('selectLanguage')">
                 <mat-option *ngFor="let data of selectLanguagesArr" [value]="data.code">
@@ -133,7 +133,7 @@ <h3>{{ "center.location-details" | translate }}</h3>
               (click)="openKeyboard('secondary')"
               style="color: grey; cursor: pointer;"
               [ngStyle]="isSecondaryLangRTL ? {'float':'left'} : {'float':'right'}">
-              <i class="material-icons">keyboard</i></span>
+              <em class="material-icons">keyboard</em></span>
             <hr />
             <h3>{{ secondaryLanguageLabels["center-details"] }}</h3>
             <div class="flex-display">
@@ -678,7 +678,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
                   *ngIf="common.exceptionalHolidays.value.length>=0 && data.exceptionHolidayDate!==null">
                   <span>{{ data.exceptionHolidayDate }}</span>
                   <div style="position: absolute;margin-left: 65px;margin-top: -18px;cursor: pointer;color: #FF4081;" (click)="deleteHoliday(i)">
-                    <i class="material-icons" [ngClass]="isPrimaryLangRTL ? 'icon-padding-right' : 'icon-padding-left'">cancel</i>
+                    <em class="material-icons" [ngClass]="isPrimaryLangRTL ? 'icon-padding-right' : 'icon-padding-left'">cancel</em>
                   </div>
                 </div>
               </ng-container>
diff --git a/admin-ui/src/app/features/resources/devices/create/create.component.html b/admin-ui/src/app/features/resources/devices/create/create.component.html
index d4e0bdf3..2dc895ef 100644
--- a/admin-ui/src/app/features/resources/devices/create/create.component.html
+++ b/admin-ui/src/app/features/resources/devices/create/create.component.html
@@ -11,8 +11,8 @@ <h3>{{ 'devices.header' | translate }}</h3>
             <strong class="title">{{ 'devices.language' | translate }}</strong>
             <span *ngIf="!disableForms" matTooltip="{{ 'devices.keyboard-tooltip' | translate }}"
               (click)="openKeyboard('primary')"  style="color: grey; cursor: pointer;"
-              [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"><i
-                class="material-icons">keyboard</i></span>
+              [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"><em
+                class="material-icons">keyboard</em></span>
             <hr />
             <br /><br />
             
diff --git a/admin-ui/src/app/features/resources/machines/create/create.component.html b/admin-ui/src/app/features/resources/machines/create/create.component.html
index 98d463af..77f6ff07 100644
--- a/admin-ui/src/app/features/resources/machines/create/create.component.html
+++ b/admin-ui/src/app/features/resources/machines/create/create.component.html
@@ -14,7 +14,7 @@ <h3>{{ 'machines.header' | translate }}</h3>
                       matTooltip="{{ 'machines.keyboard-tooltip' | translate }}"
                       (click)="openKeyboard('primary')"
                       style="float: right; color: grey; cursor: pointer;"
-                      ><i class="material-icons">keyboard</i></span
+                      ><em class="material-icons">keyboard</em></span
                     >
                     <hr />
                     <br /><br />
diff --git a/admin-ui/src/app/shared/dialog/dialog.component.html b/admin-ui/src/app/shared/dialog/dialog.component.html
index baaeec2c..9f2de502 100644
--- a/admin-ui/src/app/shared/dialog/dialog.component.html
+++ b/admin-ui/src/app/shared/dialog/dialog.component.html
@@ -7,7 +7,7 @@ <h2 class="filter-heading">{{ input.title[primaryLangCode] }}</h2>
     <table class="mat-table">
       <caption>Missing Data Table</caption>
       <tr class="mat-row sticky-header" >
-        <th class="mat-header-cell table-header sticky-header"  *ngFor="let col of input.columnNames;">
+        <th id="missingData" class="mat-header-cell table-header sticky-header"  *ngFor="let col of input.columnNames;">
           <span>{{col[primaryLangCode]}}</span>
         </th>
       </tr>
@@ -211,7 +211,7 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
 
 <div class="pop-up" *ngIf="input.case === 'CONFIRMATION'">
   <div class="pop-up-header">
-    <b mat-dialog-title>{{ input.title }}</b>
+    <strong mat-dialog-title>{{ input.title }}</strong>
     <div mat-dialog-content>
       <p style="white-space: pre-line">{{ input.message }}</p>
     </div>
@@ -248,7 +248,7 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
      *ngIf="input.title === 'Success' || input.title === 'نجاح' || input.title === 'Succès'|| input.title === 'सफलता' || input.title === 'ಯಶಸ್ಸು' || input.title === 'வெற்றி'"   />
   </div>
   <div class="pop-up-header">
-    <b mat-dialog-title>{{ input.title }}</b>
+    <strong mat-dialog-title>{{ input.title }}</strong>
     <div mat-dialog-content>
       <div [innerText]="input.message"></div>
     </div>
@@ -264,7 +264,7 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
 
 <div class="pop-up" *ngIf="input.case === 'ERROR'">
   <div class="pop-up-header">
-    <b mat-dialog-title>{{ input.title }}</b>
+    <strong mat-dialog-title>{{ input.title }}</strong>
     <div mat-dialog-content>
       <!-- <p>{{ input.message }}</p> -->
       <div [innerText]="input.message"></div>
@@ -274,7 +274,7 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
 
 <div class="pop-up" *ngIf="input.case === 'STEPS-MESSAGE'">
   <div class="pop-up-header">
-    <b mat-dialog-title>{{ createUpdateSteps.title }}</b>
+    <strong mat-dialog-title>{{ createUpdateSteps.title }}</strong>
     <div mat-dialog-content>
       <p>{{ input.message }}</p>
     </div>
@@ -290,7 +290,7 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
 
 <div class="pop-up" *ngIf="input.case === 'NOZONE'">
   <div class="pop-up-header">
-    <b mat-dialog-title>{{ input.title }}</b>
+    <strong mat-dialog-title>{{ input.title }}</strong>
     <div mat-dialog-content>
       <div [innerText]="input.message"></div>
     </div>
diff --git a/admin-ui/src/app/shared/dialog/dialog.component.ts b/admin-ui/src/app/shared/dialog/dialog.component.ts
index 84d4f196..2dac1581 100644
--- a/admin-ui/src/app/shared/dialog/dialog.component.ts
+++ b/admin-ui/src/app/shared/dialog/dialog.component.ts
@@ -385,13 +385,9 @@ export class DialogComponent implements OnInit {
           filter[0].autocomplete === 'true'
         ) {
           const filterValue = this.filterGroup.controls[key].value.toString();
-          if (filterValue.endsWith('*') && filterValue.startsWith('*')) {
+          if (filterValue.endsWith('*') || filterValue.startsWith('*') || filterValue.includes('*')) {
             filterType = 'contains';
-          } else if (filterValue.endsWith('*')) {
-            filterType = 'contains';
-          } else if (filterValue.includes('*')) {
-            filterType = 'contains';
-          } else {
+        } else {
             filterType = 'contains';
           }
         } else if (
diff --git a/admin-ui/src/app/shared/table/table.component.html b/admin-ui/src/app/shared/table/table.component.html
index 850456a4..a54d22d3 100644
--- a/admin-ui/src/app/shared/table/table.component.html
+++ b/admin-ui/src/app/shared/table/table.component.html
@@ -1,11 +1,12 @@
 <div class="container">
   <table class="mat-table">
     <tr class="mat-row sticky-header">
-      <th *ngIf="showRadioButton"></th>
+      <th *ngIf="showRadioButton" id="tableData"></th>
       <th
         *ngFor="let columnName of displayedColumns; let i = index"
         class="mat-header-cell table-header sticky-header"
         [ngStyle]="{'width': columnName?.styles?.width ? columnName.styles.width : auto}"
+        id="tableColumn"
       >
         <span class="columnName-sort-span" 
           ><span
@@ -38,7 +39,7 @@
               class="sort-icon" /></span
         ></span>
       </th>
-      <th class="table-header sticky-header">&emsp;</th>
+      <th class="table-header sticky-header" id="tableHeader">&emsp;</th>
     </tr>
     <tr *ngFor="let data of tableData; index as i" class="mat-header-row">
       <td *ngIf="showRadioButton">
diff --git a/admin-ui/src/app/shared/toolbar/toolbar.component.html b/admin-ui/src/app/shared/toolbar/toolbar.component.html
index dd64ec66..d82bd1f9 100644
--- a/admin-ui/src/app/shared/toolbar/toolbar.component.html
+++ b/admin-ui/src/app/shared/toolbar/toolbar.component.html
@@ -12,10 +12,10 @@
           'filter-button-style': button.buttonName.eng === 'Filter'
         }"
       >
-      <img [src]="button.imagePath" alt="Button Icon"/>
+      <img [src]="button.imagePath"/>
       <span class="button-name">{{ button.buttonName[lang]}}</span>
         <span class="filter-placer" *ngIf="button.buttonName.eng === 'Filter' && filtersAppliedFlag">
-          <i style="font-size: 16px;" class="material-icons">fiber_manual_record</i>
+          <em style="font-size: 16px;" class="material-icons">fiber_manual_record</em>
         </span>
       </button>
       <span style="flex: 1 1 auto;"></span>