diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html
index bbab10d8c..92011c313 100644
--- a/src/app/clients/clients-view/clients-view.component.html
+++ b/src/app/clients/clients-view/clients-view.component.html
@@ -1,72 +1,117 @@
 <mat-card class="client-card">
+
   <mat-card-header fxLayout="column" class="header">
+
     <mat-card-title-group class="header-title-group">
-      <!-- change this -->
+
       <div class="profile-image-container">
         <div>
           <img mat-card-md-image class="profile-image"
             [src]="(clientImage)?clientImage:'assets/images/user_placeholder.png'">
         </div>
+        <div fxLayoutAlign="center center" class="m-b-5">
+          <button class="client-image-button" mat-raised-button (click)="doAction('Upload Image')" matTooltip="Upload Image">
+            <i class="fa fa-upload"></i>
+          </button>
+          <button class="client-image-button" mat-raised-button matTooltip="Capture Image">
+            <i class="fa fa-camera"></i>
+          </button>
+          <button class="client-image-button" mat-raised-button (click)="doAction('Delete Image')" matTooltip="Delete Image">
+            <i class="fa fa-trash"></i>
+          </button>
+          <br>
+        </div>
+        <p (click)="doAction('View Signature')" class="signature">View Signature</p>
       </div>
+
       <div class="mat-typography client-card-title">
+
         <mat-card-title>
           <h3>
+            <i class="fa fa-stop" [ngClass]="clientViewData.status.code|statusLookup" [matTooltip]="clientViewData.status.value"></i>
             Client Name : {{clientViewData.displayName}}
           </h3>
         </mat-card-title>
+
         <mat-card-subtitle>
           <p>
             Client #:{{clientViewData.accountNo}} | External
             Id: {{clientViewData.externalId}} | Staff:{{clientViewData.staffName || 'Unassigned'}}<br />
             Activation Date :
             {{(clientViewData.activationDate)?(clientViewData.activationDate|date) :'Not Activated'}}<br />
-            Member Of : <span *ngFor="let group of clientViewData.groups">
-              <a>{{group.name}}</a>
-              &nbsp;
+            Member Of : 
+            <span *ngFor="let group of clientViewData.groups">
+              <a>{{group.name}}</a>&nbsp;
             </span>
             <span *ngIf="!clientViewData.groups">Unassigned</span>
-            <br />
+            <br/>
           </p>
         </mat-card-subtitle>
+
       </div>
+
     </mat-card-title-group>
+
     <mat-card-actions class="client-actions">
-      <button mat-raised-button [routerLink]="['edit']">Edit</button>
-      <button mat-raised-button [routerLink]="['loans', 'create-loans-account']">+ New Loan</button>
-      <button mat-raised-button [routerLink]="['savingsaccounts', 'create-savings-account']">+ New Savings</button>
-      <button mat-raised-button>+ Deposit</button>
-      <button mat-raised-button [matMenuTriggerFor]="More">More</button>
-      <mat-menu #More="matMenu">
-        <button mat-menu-item (click)="doAction('Create Standing Instructions')" *mifosxHasPermission="'READ_STANDINGINSTRUCTION'">Create Standing Instructions</button>
-        <span *ngIf="clientViewData.status.value!='Transfer on hold'"><button mat-menu-item (click)="doAction('View Standing Instructions')" *mifosxHasPermission="'CREATE_STANDINGINSTRUCTION'">View Standing Instructions</button></span>
+
+      <span>
+        <button mat-raised-button [routerLink]="['edit']">
+          <i class="fa fa-edit"></i>Edit</button>
+      </span>
+      
+      <button mat-raised-button [matMenuTriggerFor]="Applications">
+        <i class="fa fa-file"></i>Applications</button>
+      <mat-menu #Applications="matMenu">
+        <button mat-menu-item [routerLink]="['loans', 'create-loans-account']">New Loan Account</button>
+        <button mat-menu-item [routerLink]="['savingsaccounts', 'create-savings-account']">New Savings Account</button>
         <button mat-menu-item [routerLink]="['sharesaccounts', 'create-shares-account']">New Share Account</button>
         <button mat-menu-item [routerLink]="['recurringdeposits', 'create-recurring-deposits-account']">New Recurring Deposit Account</button>
         <button mat-menu-item [routerLink]="['fixed-deposits-accounts', 'create-fixed-deposit-account']">New Fixed Deposits Account</button>
-        <span *ngIf="!clientViewData.staffId"><button mat-menu-item (click)="doAction('Assign Staff')">Assign Staff</button></span>
-        <span *ngIf="clientViewData.staffId"><button mat-menu-item (click)="doAction('Unassign Staff')">Unassign Staff</button></span>
+      </mat-menu>
+
+      <button mat-raised-button [matMenuTriggerFor]="Actions">
+        <i class="fa fa-tasks"></i>Actions</button>
+      <mat-menu #Actions="matMenu">
         <button mat-menu-item (click)="doAction('Close')">Close</button>
-        <button mat-menu-item (click)="doAction('Survey')"> Survey</button>
-        <button mat-menu-item (click)="doAction('Update Default Savings')"> Update Default Savings </button>
-        <button mat-menu-item (click)="doAction('Transfer Client')"> Transfer Client </button>
-        <button mat-menu-item (click)="doAction('Add Charge')"> Add Charge </button>
-        <button mat-menu-item (click)="doAction('Upload Signature')"> Upload Signature </button>
-        <button mat-menu-item (click)="doAction('Delete Signature')"> Delete Signature </button>
-        <button mat-menu-item (click)="doAction('View Signature')"> View Signature </button>
-        <button mat-menu-item (click)="doAction('Upload Image')"> Upload Image </button>
-        <button mat-menu-item (click)="doAction('Client Screen Reports')"> Client Screen Reports </button>
-        <span *ngIf="clientImage"><button mat-menu-item (click)="doAction('Delete Image')"> Delete Image </button></span>
-        <span *ngIf="clientViewData.status.value === 'Transfer in progress'"><button mat-menu-item (click)="doAction('Undo Transfer')">Undo Transfer</button></span>
-        <span *ngIf="clientViewData.status.value === 'Transfer in progress'"><button mat-menu-item (click)="doAction('Accept Transfer')">Accept Transfer</button></span>
-        <span *ngIf="clientViewData.status.value === 'Transfer in progress'"><button mat-menu-item (click)="doAction('Reject Transfer')">Reject transfer</button></span>
+        <button mat-menu-item (click)="doAction('Transfer Client')">Transfer Client</button>
         <span *ngIf="clientViewData.status.value === 'Pending'"><button mat-menu-item (click)="doAction('Activate')">Activate</button></span>
         <span *ngIf="clientViewData.status.value === 'Pending'"><button mat-menu-item (click)="doAction('Withdraw')">Withdraw</button></span>
         <span *ngIf="clientViewData.status.value === 'Pending'"><button mat-menu-item (click)="doAction('Reject')">Reject</button></span>
         <span *ngIf="clientViewData.status.value === 'Pending'"><button mat-menu-item (click)="doAction('Delete')">Delete</button></span>
         <span *ngIf="clientViewData.status.value === 'Closed'"><button mat-menu-item (click)="doAction('Reactivate')">Reactivate</button></span>
         <span *ngIf="clientViewData.status.value === 'Rejected'"><button mat-menu-item (click)="doAction('Undo Rejection')">Undo Rejection</button></span>
+        <span *ngIf="clientViewData.status.value === 'Transfer in progress'"><button mat-menu-item (click)="doAction('Undo Transfer')">Undo Transfer</button></span>
+        <span *ngIf="clientViewData.status.value === 'Transfer in progress'"><button mat-menu-item (click)="doAction('Accept Transfer')">Accept Transfer</button></span>
+        <span *ngIf="clientViewData.status.value === 'Transfer in progress'"><button mat-menu-item (click)="doAction('Reject Transfer')">Reject transfer</button></span>
       </mat-menu>
+      
+      <span *ngIf="!clientViewData.staffId">
+        <button mat-raised-button (click)="doAction('Assign Staff')">
+          <i class="fa fa-user"></i>Assign Staff</button>
+      </span>
+      <span *ngIf="clientViewData.staffId">
+        <button mat-raised-button (click)="doAction('Unassign Staff')">
+          <i class="fa fa-user"></i>Unassign Staff</button>
+      </span>
+
+      <button mat-raised-button [matMenuTriggerFor]="More">More</button>
+      <mat-menu #More="matMenu">
+        <button mat-menu-item (click)="doAction('Add Charge')"> Add Charge </button>
+        <button mat-menu-item (click)="doAction('Survey')">Survey</button>
+        <button mat-menu-item (click)="doAction('Update Default Savings')"> Update Default Savings </button>
+        <button mat-menu-item (click)="doAction('Upload Signature')"> Upload Signature </button>
+        <button mat-menu-item (click)="doAction('Delete Signature')"> Delete Signature </button>
+        <button mat-menu-item (click)="doAction('Client Screen Reports')"> Client Screen Reports </button>
+        <button mat-menu-item (click)="doAction('Create Standing Instructions')" *mifosxHasPermission="'READ_STANDINGINSTRUCTION'">Create Standing Instructions</button>
+        <span *ngIf="clientViewData.status.value!='Transfer on hold'">
+          <button mat-menu-item (click)="doAction('View Standing Instructions')" *mifosxHasPermission="'CREATE_STANDINGINSTRUCTION'">View Standing Instructions</button>
+        </span>
+      </mat-menu>
+
     </mat-card-actions>
+
   </mat-card-header>
+
   <mat-card-content>
     <nav mat-tab-nav-bar class="navigation-tabs">
       <a mat-tab-link [routerLink]="['./general']" routerLinkActive #general="routerLinkActive"
@@ -97,6 +142,9 @@
         {{clientDatatable.registeredTableName}}
       </a>
     </nav>
+
     <router-outlet></router-outlet>
+
   </mat-card-content>
-</mat-card>
\ No newline at end of file
+
+</mat-card>
diff --git a/src/app/clients/clients-view/clients-view.component.scss b/src/app/clients/clients-view/clients-view.component.scss
index 9be697070..adf227ce9 100644
--- a/src/app/clients/clients-view/clients-view.component.scss
+++ b/src/app/clients/clients-view/clients-view.component.scss
@@ -7,6 +7,7 @@
     padding: 1%;
     .header-title-group {
       .client-card-title {
+        margin-top: 1.4rem;
         color: white;
         width: 90%;
         p {
@@ -20,13 +21,36 @@
         object-fit: cover;
         border-radius: 20px;
       }
+      .client-image-button {
+        min-width: 26px;
+        padding: 0 6px;
+        margin: 4px;
+        line-height: 25px;
+      }
+      .signature {
+        background-color: #0a6aac;
+        color: white;
+        text-align: center;
+        margin: 0;
+        padding: 2%;
+        &:hover {
+          cursor: pointer;
+        }
+      }
     }
     .client-actions {
       align-self: flex-end;
       margin: 0 1%;
+      i {
+        margin-bottom: 2px;
+        margin-right: 4px;
+      }
     }
   }
   .navigation-tabs {
     overflow: auto;
   }
+  i:hover {
+    cursor: pointer;
+  }
 }