diff --git a/resident-ui/src/app/app.component.ts b/resident-ui/src/app/app.component.ts
index e6060dd5..40513493 100644
--- a/resident-ui/src/app/app.component.ts
+++ b/resident-ui/src/app/app.component.ts
@@ -195,9 +195,6 @@ export class AppComponent {
 
   preventBack() {
     window.history.forward();
-    window.onunload = function() {
-      null;
-    };
   }
 
   @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) {
diff --git a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css
index b471003f..830892bb 100644
--- a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css
+++ b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css
@@ -304,7 +304,6 @@ input[type="radio"] {
   box-shadow: 4px black;
   border-radius: 4px !important;
   display: inline-flex;
-  display: inline-flex;
   padding: 7px;
   border: 2px solid #909090;
 }
@@ -422,7 +421,7 @@ input[type="radio"] {
   font-size: var(--fs) !important;
 }
 
-@media screen and ((min-width:601px) and (max-width: 780px)){
+@media screen and (min-width:601px) and (max-width: 780px){
   .map{
     width: 100%;
   }
diff --git a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.html b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.html
index a36aefc1..9da9ab5d 100644
--- a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.html
+++ b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.html
@@ -47,8 +47,8 @@
                           placeholder="{{ 'centerSelection.text_search' | translate }}" name="search" class="search-input"
                           [(ngModel)]="searchText" (input)="searchInput()" (blur)="captureValue($event)"
                           (focus)="captureVirtualKeyboard(search, 0)" id="searchLocationBox" #keyboardRef />
-                        <i *ngIf="locationType" style="float: right; color: grey; cursor: pointer;" matSuffix
-                          class="material-icons" (click)="openKeyboard('searchLocationBox')">keyboard</i>
+                        <em *ngIf="locationType" style="float: right; color: grey; cursor: pointer;" matSuffix
+                          class="material-icons" (click)="openKeyboard('searchLocationBox')">keyboard</em>
                       </mat-card>
                     </div>
                     <div class="manual-loc-search-btns" > 
diff --git a/resident-ui/src/app/feature/booking/map/map.component.css b/resident-ui/src/app/feature/booking/map/map.component.css
index 34378abe..e9aceec5 100644
--- a/resident-ui/src/app/feature/booking/map/map.component.css
+++ b/resident-ui/src/app/feature/booking/map/map.component.css
@@ -4,7 +4,7 @@
     height: 90%;
 }
 
-@media screen and ((min-width:601px) and (max-width: 780px)){
+@media screen and (min-width:601px) and (max-width: 780px){
     .map {
         height: 84%;
     }
diff --git a/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.css b/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.css
index e5e675a5..2d11a985 100644
--- a/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.css
+++ b/resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.css
@@ -130,7 +130,7 @@ div.item-card:hover{
   border-radius: 25px !important;
 }
 
-@media screen and ((min-width:900px) and (max-width:1250px)){
+@media screen and (min-width:900px) and (max-width:1250px){
   .main-div{
     grid-template-columns: 1fr 1fr;
     grid-template-rows: 1fr 1fr;
diff --git a/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.css b/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.css
index f174ab27..775267bf 100644
--- a/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.css
+++ b/resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.css
@@ -113,7 +113,7 @@ label {
     color: #ffffff;
 }
 
-@media screen and ((min-width:530px) and (max-width:755px)){
+@media screen and (min-width:530px) and (max-width:755px){
     .main-container{
         padding: 0 3rem 0 3rem;
     }
diff --git a/resident-ui/src/app/feature/getuin/getuin/getuin.component.css b/resident-ui/src/app/feature/getuin/getuin/getuin.component.css
index 8bd1c13e..9caa26b4 100644
--- a/resident-ui/src/app/feature/getuin/getuin/getuin.component.css
+++ b/resident-ui/src/app/feature/getuin/getuin/getuin.component.css
@@ -330,7 +330,7 @@ ul li:last-child hr{
 }
 
 
-@media screen and ((min-width:1000px) and (max-width:1450px)){
+@media screen and (min-width:1000px) and (max-width:1450px){
     ul li:last-child hr{
         width: 88%;
         left: -40%;
@@ -338,7 +338,7 @@ ul li:last-child hr{
     }
 }
 
-@media screen and ((min-width:680px) and (max-width:999px)){
+@media screen and (min-width:680px) and (max-width:999px){
     ul li:last-child hr{
         width: 88%;
         left: -34%;
diff --git a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.css b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.css
index fcfb5bdb..021f8374 100644
--- a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.css
+++ b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.css
@@ -56,13 +56,13 @@ mat-card-title {
   width: 24.5%;
 }
 
-@media screen and ((min-width:1230px) and (max-width:1900px)){
+@media screen and (min-width:1230px) and (max-width:1900px){
   .each-service-card{
     width: 32.5%;
   }
 }
 
-@media screen and ((min-width:900px) and (max-width:1229px)) {
+@media screen and (min-width:900px) and (max-width:1229px) {
   .each-service-card{
     width: 48.5%;
   }
diff --git a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.html b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.html
index af9e05e3..38b21710 100644
--- a/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.html
+++ b/resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.html
@@ -9,7 +9,7 @@ <h2 [style.font-size]="fontSize.heading" class="uin-heading">{{'dashboard.uinser
 		<div *ngIf="menuItems" class="uin-service-card">
 			<div class="each-service-card" *ngFor="let item of menuItems[0].subMenus">
 				<mat-card class="mini-card" (click)="onItemSelected(item.route)" [id]="item.route">
-					<span><img mat-card-xs-image [src]=item.icon /></span>
+					<span><img mat-card-xs-image [src]=item.icon alt=""/></span>
 					<mat-card-title class="uin-services-heading" [style.font-size]="fontSize.headingForUIN">{{item.displayName}}</mat-card-title>
 					<mat-card-subtitle [style.font-size]="fontSize.paragraph"
 						class="services-description">{{item.description}}</mat-card-subtitle>
diff --git a/resident-ui/src/app/feature/uinservices/grievance/grievance.component.html b/resident-ui/src/app/feature/uinservices/grievance/grievance.component.html
index 254b5b0b..efeb0415 100644
--- a/resident-ui/src/app/feature/uinservices/grievance/grievance.component.html
+++ b/resident-ui/src/app/feature/uinservices/grievance/grievance.component.html
@@ -23,7 +23,7 @@
             <label class="label">{{grievanceData.alternateemailidlabel}}</label>
             <div class="input-card">
               <input [style.font-size]="fontSize.lableText" id="alternateEmailID" [attr.maxLength]="emailCharLimit" placeholder="{{grievanceData.alternateEmailPlaceholder}}" type="text" name="alternateEmailId" (blur)="captureValue($event, 'alternateEmailId')" (focus)="captureVirtualKeyboard(search, 0)"  #keyboardRef/>
-              <i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternateEmailID')">keyboard</i>
+              <em matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternateEmailID')">keyboard</em>
             </div>
           </div>
           <div class="each-property-card">
@@ -34,7 +34,7 @@
             <label class="label">{{grievanceData.alternatephonenumberlabel}}</label>
               <div class="input-card">
                 <input [style.font-size]="fontSize.lableText" id="alternatePhoneNumber" [attr.maxLength]="phoneCharLimit" placeholder={{grievanceData.alternatePhoneNoPlaceholder}} type="text" name="alternatePhoneNo" (blur)="captureValue($event, 'alternatePhoneNumber')" (focus)="captureVirtualKeyboard(search, 1)"  #keyboardRef/>
-                <i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternatePhoneNumber')">keyboard</i>
+                <em matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('alternatePhoneNumber')">keyboard</em>
               </div>
             </div >
           <div class="each-property-card">
@@ -46,7 +46,7 @@
             <div class="message-input-card">
               <div class="comment-input-sub-card">
                 <textarea [style.font-size]="fontSize.lableText" id="userComment" [attr.maxLength]="totalCommentCount" (input)="countCharacters($event, 'message')" (blur)="countCharacters($event,'message')" (focus)="captureVirtualKeyboard(search, 2)"  #keyboardRef placeholder={{grievanceData.EnterMsgPlaceholder}} rows="4" cols="60" name="message" ></textarea>
-                <i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('userComment')">keyboard</i>
+                <em matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard('userComment')">keyboard</em>
               </div>
                 <span [style.font-size]="fontSize.breadcrumb" class="input-count" >{{grievanceData.TotalCharacters}}: {{totalCommentCount}}</span>
               <span [style.font-size]="fontSize.breadcrumb" class="input-count" >{{grievanceData.remainingCharacters}}: {{remainingChars}}</span>
diff --git a/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.css b/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.css
index 885a1300..ee8a8c20 100644
--- a/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.css
+++ b/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.css
@@ -84,7 +84,7 @@ mat-card-header,
   margin-bottom: 0px;
 }
 
-@media screen and ((min-width:600px) and (max-width:1500px)){
+@media screen and (min-width:600px) and (max-width:1500px){
   .mini-card {
     width: 98%;
     height: 180px;
diff --git a/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts b/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
index 206fa4bc..b4d9e375 100644
--- a/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
+++ b/resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
@@ -130,15 +130,15 @@ export class LockunlockauthComponent implements OnInit, OnDestroy {
             authTypesJSON["authSubType"] =  authTypes[i].split('-')[1];
 
             if(authTypes[i].split('-')[1]){
-              newAuthlist.find(el => {      
+              newAuthlist.forEach(el => {      
                 if(el.authSubType === authTypes[i].split('-')[1]){
-                  return authTypesJSON["locked"] = el.locked;
+                  authTypesJSON["locked"] = el.locked;
                 }           
               })
             }else{
-              newAuthlist.find(el => {  
+              newAuthlist.forEach(el => {  
                 if(el.authType === authTypes[i]){                  
-                  return authTypesJSON["locked"] = el.locked;
+                  authTypesJSON["locked"] = el.locked;
                 }                    
               })
             }   
diff --git a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.css b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.css
index 89998e3f..39883fe5 100644
--- a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.css
+++ b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.css
@@ -1,5 +1,4 @@
 .intro-description {
-    font: normal normal medium 16px/22px Montserrat Medium;
     letter-spacing: 0px;
     color: #505050;
 }
diff --git a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
index 85f7a573..3b2e9fea 100644
--- a/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
+++ b/resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
@@ -253,9 +253,9 @@ export class PersonalisedcardComponent implements OnInit, OnDestroy {
             if (data['attributeName'] === item['attributeName']) {
               item['formatOption'][this.langCode].forEach(eachItem => {
                 if (eachItem.value === type['value']) {
-                  return eachItem['checked'] = !eachItem['checked']
+                  return eachItem['checked'] = !eachItem['checked'];
                 } else {
-                  return eachItem['checked'] = eachItem['checked']
+                  return eachItem['checked'];
                 }
               })
             }
diff --git a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.css b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.css
index 85c27ed5..b31fc38b 100644
--- a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.css
+++ b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.css
@@ -9,7 +9,6 @@ ul, li{
   background: #FAF8F8 0% 0% no-repeat padding-box;
   box-shadow: none;
   border: 1px solid silver;
-  background: #FAF8F8 0% 0% no-repeat padding-box;
 }
 .mat-card-header-text{
   display: flex;
diff --git a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.html b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.html
index d0446ad3..856167fb 100644
--- a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.html
+++ b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.html
@@ -32,7 +32,7 @@ <h4 [style.font-size]="fontSize.subHeading" style="color: #000000;">{{langJSON[p
 							  </tr>
 							  <tr>
 							    <td colspan="2" >
-							    	<span [style.font-size]="fontSize.paragraph" class="mat-card-header-text"  *ngIf=list.showvid><span style="width: 11rem;">{{list.vid}}</span>&nbsp;&nbsp;&nbsp;<span style="cursor:pointer;" (click)="displayVid(finalTypeList, policy.vidType, list, false)"><img src="assets\eye_slash.png" style="color: green;width: 18px;"></span></span>
+							    	<span [style.font-size]="fontSize.paragraph" class="mat-card-header-text"  *ngIf=list.showvid><span style="width: 11rem;">{{list.vid}}</span>&nbsp;&nbsp;&nbsp;<span style="cursor:pointer;" (click)="displayVid(finalTypeList, policy.vidType, list, false)"><img src="assets\eye_slash.png" style="color: green;width: 18px;" alt=""></span></span>
 							    	<span [style.font-size]="fontSize.paragraph" class="mat-card-header-text" *ngIf=!list.showvid><span style="width: 11rem;">{{list.maskedVid}}</span>&nbsp;&nbsp;&nbsp;<mat-icon style="color: green;font-size: 18px;cursor:pointer;" (click)="displayVid(finalTypeList, policy.vidType, list, true)">remove_red_eye</mat-icon></span>
 							    </td>
 							  </tr>
@@ -61,7 +61,7 @@ <h4 [style.font-size]="fontSize.subHeading" style="color: #000000;">{{langJSON[p
 							    	<span [style.font-size]="fontSize.paragraph" *ngIf="!list.transactionsLeftCount">NA</span>							    	
 							    </td>
 							    <td style="width:50%;float: right;">
-							    	<span (click)="downloadVIDBtn(list.vid,policy.vidType)" style="color: green;font-size: 24px;cursor:pointer;"><img id="download{{i}}" src="assets\download.png"></span>&nbsp;&nbsp;&nbsp;
+							    	<span (click)="downloadVIDBtn(list.vid,policy.vidType)" style="color: green;font-size: 24px;cursor:pointer;"><img id="download{{i}}" src="assets\download.png" alt=""></span>&nbsp;&nbsp;&nbsp;
 							    	<mat-icon id="delete{{i}}" style="color: #DB4F4F;font-size: 24px;cursor:pointer;" (click)="revokeVIDBtn(list.vid,policy.vidType)">delete</mat-icon>
 							    </td>
 							  </tr>
diff --git a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
index 656ddc57..968e0b81 100644
--- a/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
+++ b/resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
@@ -296,7 +296,7 @@ export class RevokevidComponent implements OnInit, OnDestroy {
   revokeVIDBtn(vidValue: any,vidType:any){
     this.showDeleteMessage(vidType)
     this.newVidValue = vidValue
-    this.newVidType - vidType
+    this.newVidType = vidType
   }
 
   revokeVID(vidValue: any) {
diff --git a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.css b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.css
index 8005e411..d9b365f9 100644
--- a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.css
+++ b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.css
@@ -34,7 +34,6 @@
 
 .success-msg-description {
   text-align: left;
-  font: normal normal medium 14px/22px Poppins;
   letter-spacing: 0px;
   color: #505050;
   margin-left: 1.5rem;
@@ -43,7 +42,6 @@
 }
 
 .success-msg-text {
-  font: normal normal medium 20px/20px Poppins;
   letter-spacing: 0px;
   color: #03A64A;
   font-size: 21px;
diff --git a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html
index 7e29fa93..13774f6b 100644
--- a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html
+++ b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.html
@@ -117,7 +117,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" style="color: #050505;">{{'sharew
 											(input)="getpurpose($event)"
 											(blur)="getpurpose($event)"
                                             (focus)="captureVirtualKeyboard(search, 0)" #keyboardRef></textarea>
-											<i style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</i>
+											<em style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</em>
 										</span>
 											<span [style.fontSize]="fontSize.breadcrumb"
 											style="color:red; display: block;">{{'sharewithpartner.TotalCharacters'
diff --git a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
index 7e333658..6589ba2b 100644
--- a/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
+++ b/resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
@@ -316,9 +316,9 @@ export class SharewithpartnerComponent implements OnInit, OnDestroy {
             if (data['attributeName'] === eachItem['attributeName']) {
               eachItem['formatOption'][this.langCode].forEach(item => {
                 if (item.value === type['value']) {
-                  return item['checked'] = !item['checked']
+                  return item['checked'] = !item['checked'];
                 } else {
-                  return item['checked'] = item['checked']
+                  return item['checked'];
                 }
               })
             }
diff --git a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
index 82870b13..9b65ba91 100644
--- a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
+++ b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
@@ -30,7 +30,7 @@
 						  #keyboardRef
 						  type="number"
 						  placeholder="{{'trackservicerequest.searchPlaceholder' | translate}}" />
-						  <i style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</i>
+						  <em style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</em>
 					    </span>
 						&nbsp;&nbsp;&nbsp;&nbsp;
 						<button [style.font-size]="fontSize.paragraph" [disabled]="disableTrackBtn" id="getEIDStatusbtn" mat-raised-button class="track-btn"
@@ -85,7 +85,7 @@
 				</tr>
 				<!-- Authentication Request -->
 				<tr [style.font-size]="fontSize.breadcrumb" *ngIf="eidStatus.info.eventTypeEnum === 'AUTHENTICATION_REQUEST' "
-					style="padding:10px; padding:10px; border-top: 1px solid silver;">
+					style="padding:10px; border-top: 1px solid silver;">
 					<td><label>{{'trackservicerequest.partnerLogo' | translate}} </label></td>
 					<td><label>{{'trackservicerequest.partnerName' | translate}} </label></td>
 				</tr>
@@ -95,7 +95,7 @@
 				</tr>
 				<!-- Manage my VID	 -->
 				<tr [style.font-size]="fontSize.breadcrumb" *ngIf="eidStatus.info.eventTypeEnum === 'GENERATE_VID' "
-					style="padding:10px; padding:10px; border-top: 1px solid silver;">
+					style="padding:10px; border-top: 1px solid silver;">
 					<td><label>{{'trackservicerequest.vidType' | translate}} </label></td>
 					<td><label>{{'trackservicerequest.vid' | translate}} </label></td>
 				</tr>
@@ -105,7 +105,7 @@
 				</tr>
 				<!-- Share credential with partner	 -->
 				<tr [style.font-size]="fontSize.breadcrumb" *ngIf="eidStatus.info.eventTypeEnum === 'SHARE_CRED_WITH_PARTNER' "
-					style="padding:10px; padding:10px; border-top: 1px solid silver;">
+					style="padding:10px; border-top: 1px solid silver;">
 					<td style="width:25%"><label>{{'trackservicerequest.partnerLogo' | translate}} </label></td>
 					<td style="width:25%"><label>{{'trackservicerequest.partnerName' | translate}} </label></td>
 					<td style="width:25%"><label>{{'trackservicerequest.attributeList' | translate}} </label></td>
@@ -128,7 +128,7 @@
 				</div>
 				<button [style.font-size]="fontSize.paragraph" id="downloadAcknowledgementbtn" style="cursor: pointer;" class="download-btn"
 				    (click)="downloadAcknowledgement()"><img class="save-icon"
-						src="./assets/images/save.png" />{{'trackservicerequest.downloadbuttonLabel' |
+						src="./assets/images/save.png" alt=""/>{{'trackservicerequest.downloadbuttonLabel' |
 					translate}}</button>
 			</div>
 			<div *ngIf="eidStatus.info.eventTypeEnum === 'VID_CARD_DOWNLOAD' "
@@ -141,14 +141,14 @@
 				</div>
 				<button [style.font-size]="fontSize.paragraph" id="downloadAcknowledgementbtn" style="cursor: pointer;" class="download-btn"
 					(click)="downloadAcknowledgement()"><img class="save-icon"
-						src="./assets/images/save.png" />{{'trackservicerequest.downloadbuttonLabel' |
+						src="./assets/images/save.png" alt=""/>{{'trackservicerequest.downloadbuttonLabel' |
 					translate}}</button>
 			</div>
 			<div *ngIf="eidStatus.info.eventTypeEnum !== 'UPDATE_MY_UIN' && eidStatus.info.eventTypeEnum !== 'VID_CARD_DOWNLOAD' "
 				style="display: flex; justify-content: flex-end; width: 100%; margin-top: 1rem;">
 				<button [style.font-size]="fontSize.paragraph" id="downloadAcknowledgementbtn" style="cursor: pointer;" class="download-btn"
 					(click)="downloadAcknowledgement()"><img class="save-icon"
-						src="./assets/images/save.png" />{{'trackservicerequest.downloadbuttonLabel' |
+						src="./assets/images/save.png" alt=""/>{{'trackservicerequest.downloadbuttonLabel' |
 					translate}}</button>
 			</div>
 
diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css
index 097e3476..416ae527 100644
--- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css
+++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css
@@ -127,7 +127,6 @@ input.readonly{
    align-items: center;
    border: dashed 1px #03A64A;
    margin-bottom: 1rem;
-   display: flex;
    flex-grow: 1;
 }
 .files-list .single-file .preview {
@@ -175,7 +174,6 @@ input.readonly{
   align-items: center;
   border: solid 1px #000000;
   margin-bottom: 1rem;
-  display: flex;
   flex-grow: 1;
   border-radius: 4px;
 }
@@ -536,7 +534,7 @@ input.readonly{
   font-size: var(--fs) !important;
 }
 
-@media screen and ((min-width:950px) and (max-width:1300px)){
+@media screen and (min-width:950px) and (max-width:1300px){
   .number-of-attems-main-card{
     width: 80%;
   }
@@ -551,7 +549,7 @@ input.readonly{
   }
 }
 
-@media screen and ((min-width:824px) and (max-width:959px)) {
+@media screen and (min-width:824px) and (max-width:959px) {
   .main-contianer{
     padding: 0.5rem 3rem 0 3rem; 
   }
@@ -579,7 +577,7 @@ input.readonly{
   }
 }
 
-@media screen and ((min-width:550px) and (max-width:820px)) {
+@media screen and (min-width:550px) and (max-width:820px) {
   .contact-update-card{
     flex-direction: column;
   }
@@ -624,7 +622,7 @@ input.readonly{
 
 }
 
-@media screen and ((min-width:550px) and (max-width:749px)) {
+@media screen and (min-width:550px) and (max-width:749px) {
   .width-of-input{
     width: 36%;
   }
diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
index 4c50ab00..c50dd067 100644
--- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
+++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
@@ -186,8 +186,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                   (click)="isUpdatedataInProgress($event, 'textField')"
                                   [disabled]="attributeUpdateCountRemainLimit[field.attributeName] === 0"
                                   #keyboardRef />
-                                <i *ngIf="attributeUpdateCountRemainLimit[field.attributeName] !== 0" matSuffix class="material-icons mat-keyboard-icon"
-                                  (click)="openKeyboard(field.attributeName+item.language, item.language)">keyboard</i>
+                                <em *ngIf="attributeUpdateCountRemainLimit[field.attributeName] !== 0" matSuffix class="material-icons mat-keyboard-icon"
+                                  (click)="openKeyboard(field.attributeName+item.language, item.language)">keyboard</em>
                               </div>
 
                             </td>
@@ -245,8 +245,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                   (click)="isUpdatedataInProgress($event, 'textField')"
                                   [disabled]="attributeUpdateCountRemainLimit[field.attributeName] === 0"
                                   #keyboardRef />
-                                <i *ngIf="attributeUpdateCountRemainLimit[field.attributeName] !== 0" matSuffix class="material-icons mat-keyboard-icon"
-                                  (click)="openKeyboard(field.attributeName+item.language+'Mobile', item.language)">keyboard</i>
+                                <em *ngIf="attributeUpdateCountRemainLimit[field.attributeName] !== 0" matSuffix class="material-icons mat-keyboard-icon"
+                                  (click)="openKeyboard(field.attributeName+item.language+'Mobile', item.language)">keyboard</em>
                               </div>
                             </td>
                           </tr>
@@ -425,8 +425,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                   (blur)="captureValue($event, field.attributeName, '', '')"
                                   (focus)="captureVirtualKeyboard(field.attributeName + 'value', buildJSONData.proofOfIdentity)"
                                   #keyboardRef />
-                                <i matSuffix class="material-icons mat-keyboard-icon"
-                                  (click)="openKeyboard(field.attributeName +'value')">keyboard</i>
+                                <em matSuffix class="material-icons mat-keyboard-icon"
+                                  (click)="openKeyboard(field.attributeName +'value')">keyboard</em>
                               </div>
                             </td>
                           </tr>
@@ -578,8 +578,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                     (click)="isUpdatedataInProgress($event, 'textField')"
                                     (focus)="captureVirtualKeyboard(field.attributeName+item.language, item.index)"
                                     #keyboardRef />
-                                  <i matSuffix class="material-icons mat-keyboard-icon"
-                                    (click)="openKeyboard(field.attributeName+item.language, item.language)">keyboard</i>
+                                  <em matSuffix class="material-icons mat-keyboard-icon"
+                                    (click)="openKeyboard(field.attributeName+item.language, item.language)">keyboard</em>
                                 </div>
                               </td>
                             </tr>
@@ -611,8 +611,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                     (click)="isUpdatedataInProgress($event, 'textField')"
                                     (focus)="captureVirtualKeyboard(field.attributeName+item.language+'Mobile', item.mobileIndex)"
                                     #keyboardRef />
-                                  <i matSuffix class="material-icons mat-keyboard-icon"
-                                    (click)="openKeyboard(field.attributeName+item.language+'Mobile', item.language)">keyboard</i>
+                                  <em matSuffix class="material-icons mat-keyboard-icon"
+                                    (click)="openKeyboard(field.attributeName+item.language+'Mobile', item.language)">keyboard</em>
                                 </div>
                               </td>
                             </tr>
@@ -809,8 +809,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                                     (blur)="captureAddressValue($event, field.attributeName, '')"
                                     (focus)="captureVirtualKeyboard(field.attributeName, buildJSONData.proofOfAddress)"
                                     #keyboardRef />
-                                  <i matSuffix class="material-icons mat-keyboard-icon"
-                                    (click)="openKeyboard(field.attributeName+'value')">keyboard</i>
+                                  <em matSuffix class="material-icons mat-keyboard-icon"
+                                    (click)="openKeyboard(field.attributeName+'value')">keyboard</em>
                                 </div>
                               </td>
                             </tr>
@@ -939,8 +939,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                     (focus)="captureVirtualKeyboard(field.attributeName, buildJSONData[field.attributeName].index)"
                     (click)="isUpdatedataInProgress($event, 'textField')"
                     #keyboardRef />
-                  <i matSuffix class="material-icons mat-keyboard-icon"
-                    (click)="openKeyboard(field.attributeName)">keyboard</i>
+                  <em matSuffix class="material-icons mat-keyboard-icon"
+                    (click)="openKeyboard(field.attributeName)">keyboard</em>
                 </div>
                 <div class="search-input-card" *ngIf="field.attributeName === 'phone'">
                   <input [style.font-size]="fontSize.paragraph" class="input" [value]="userIdPhone" matInput type="text" #{{field.attributeName}}
@@ -950,8 +950,8 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
                     (focus)="captureVirtualKeyboard(field.attributeName, buildJSONData[field.attributeName].index)"
                     (click)="isUpdatedataInProgress($event, 'textField')"
                     #keyboardRef />
-                  <i matSuffix class="material-icons mat-keyboard-icon"
-                    (click)="openKeyboard(field.attributeName)">keyboard</i>
+                  <em matSuffix class="material-icons mat-keyboard-icon"
+                    (click)="openKeyboard(field.attributeName)">keyboard</em>
                 </div>
               </div>
               <div class="contact-update-each-btn-card">
diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
index 995ba931..0dba94e6 100644
--- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
+++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
@@ -690,7 +690,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
     })
     let self = this;
     if (formControlName !== "proofOfIdentity") {
-      if (event.value.toLowerCase() !== currentValueCode.toLocaleLowerCase()) {
+      if (event.value !== currentValueCode) {
         this.isSameData[formControlName] = false;
         this.userInfoClone[formControlName] = []
         this.getUserPerfLang.forEach(item => {