diff --git a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html
index b516862b..3c8b23c1 100644
--- a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html
+++ b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html
@@ -65,7 +65,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="main-heading">{{'viewhisto
 	            <p class="search-input-label"><span [style.font-size]="fontSize.paragraph" class="label">{{'viewhistory.inputStatus' | translate}}</span></p>
 	            <!-- <mat-card-subtitle style="display: flex;"> -->
 					<span class="input">
-						<button [style.font-size]="fontSize.breadcrumb" class="dropdown-btn" id="statusTypeBtn" [matMenuTriggerFor]="basic2">{{statusHistorySelectedValue}}<mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
+						<button [style.font-size]="fontSize.breadcrumb" class="dropdown-btn" id="statusTypeBtn" [matMenuTriggerFor]="basic2"><span>{{statusHistorySelectedValue}}</span><mat-icon class="dropdown-arrow">keyboard_arrow_down</mat-icon></button>
 						<mat-menu #basic2="matMenu" [xPosition]="langCode === 'ara' ? 'before' : 'after'" [backdropClass]="'viewHistory'" >
 							<ng-container *ngFor="let status of statusTypeFilter">
 								<button mat-menu-item>
diff --git a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
index 6fe6086d..59cf888a 100644
--- a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
+++ b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
@@ -222,13 +222,11 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
 
     if(!this.statusHistorySelectedValue){
       this.statusHistorySelectedValue = this.langJSON.viewhistory.status;
-    }else if(this.statusHistorySelectedValue.length > 26){
-      this.statusHistorySelectedValue = this.statusHistorySelectedValue.substring(0,24) + "...";
     }else{
       this.statusHistorySelectedValue = this.statusHistorySelectedValue.replace(/,\s*$/, "");
     }
     
-    if(count === 3){
+    if(count === (this.statusTypeFilter.length - 1)){
       this.isStatusAllValue = !this.isStatusAllValue;
       this.tosslePerOne(this.isStatusAllValue, formControlName);
     }
@@ -272,12 +270,12 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
     if(!this.serviceHistorySelectedValue){
       this.serviceHistorySelectedValue = this.langJSON.viewhistory.historyType;
     }else if(this.serviceHistorySelectedValue.length > 26){
-      this.serviceHistorySelectedValue = this.serviceHistorySelectedValue.substring(0,24) + "...";
+      this.serviceHistorySelectedValue = this.serviceHistorySelectedValue.substring(0,36) + "...";
     }else{
       this.serviceHistorySelectedValue = this.serviceHistorySelectedValue.replace(/,\s*$/, "");
     }
 
-    if(count === 5){
+    if(count ===  (this.serviceTypeFilter.length - 1)){
       this.isHistoryAllValue = !this.isHistoryAllValue;
       this.historyTosslePerOne(this.isHistoryAllValue, formControlName);
     }
diff --git a/resident-ui/src/app/shared/header/header.component.css b/resident-ui/src/app/shared/header/header.component.css
index 5faea5cc..570c16e6 100644
--- a/resident-ui/src/app/shared/header/header.component.css
+++ b/resident-ui/src/app/shared/header/header.component.css
@@ -90,7 +90,7 @@
   /* width: 250px !important; */
   /* height: auto !important; */
   padding-top: 0px !important;
-  padding-bottom: 0px !important;
+  /* padding-bottom: 0px !important; */
 }
 
 .mat-menu-item {