diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
index f503d3dc56..eb744a0aa2 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts
@@ -114,7 +114,7 @@ export class FixedDepositAccountViewComponent implements OnInit {
       case 'Undo Approval':
       case 'Undo Activation':
       case 'Add Charge':
-      case 'Withdraw By Client':
+      case 'Withdrawn by Client':
       case 'Premature Close':
         this.router.navigate([`actions/${name}`], { relativeTo: this.route });
         break;
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
index dafeaf7859..14898dc0a5 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts
@@ -101,7 +101,7 @@ export class FixedDepositsButtonsConfiguration {
             name: 'Reject'
           },
           {
-            name: 'Withdraw By Client'
+            name: 'Withdrawn by Client'
           },
           {
             name: 'Add Charge'
diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html
index e2b46473ac..ffb6adba9a 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html
+++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.html
@@ -2,7 +2,7 @@
 <mifosx-reject-fixed-deposits-account *ngIf="actions['Reject']"></mifosx-reject-fixed-deposits-account>
 <mifosx-activate-fixed-deposits-account *ngIf="actions['Activate']"></mifosx-activate-fixed-deposits-account>
 <mifosx-undo-approval-fixed-deposits-account *ngIf="actions['Undo Approval'] || actions['Undo Activation']"></mifosx-undo-approval-fixed-deposits-account>
-<mifosx-withdraw-by-client-fixed-deposits-account *ngIf="actions['Withdraw By Client']"></mifosx-withdraw-by-client-fixed-deposits-account>
+<mifosx-withdraw-by-client-fixed-deposits-account *ngIf="actions['Withdrawn by Client']"></mifosx-withdraw-by-client-fixed-deposits-account>
 <mifosx-add-charge-fixed-deposits-account *ngIf="actions['Add Charge']"></mifosx-add-charge-fixed-deposits-account>
 <mifosx-premature-close-fixed-deposits-account *ngIf="actions['Premature Close']"></mifosx-premature-close-fixed-deposits-account>
 <mifosx-close-fixed-deposits-account *ngIf="actions['Close']"></mifosx-close-fixed-deposits-account>
diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.ts
index d5dd463fea..ea3f464ea6 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/fixed-deposits-account-actions.component.ts
@@ -22,7 +22,7 @@ export class FixedDepositsAccountActionsComponent {
     'Undo Activation': boolean
     'Add Charge': boolean
     'Premature Close': boolean
-    'Withdraw By Client': boolean
+    'Withdrawn by Client': boolean
   } = {
     'Approve': false,
     'Reject': false,
@@ -32,7 +32,7 @@ export class FixedDepositsAccountActionsComponent {
     'Undo Activation': false,
     'Add Charge': false,
     'Premature Close': false,
-    'Withdraw By Client': false
+    'Withdrawn by Client': false
   };
 
   /**
diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts
index 83b27c9561..82b9d2de15 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts
@@ -9,7 +9,7 @@ import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits
 import { SettingsService } from 'app/settings/settings.service';
 
 /**
- * Withdraw By Client Fixed Deposits Account Component
+ * Withdrawn by Client Fixed Deposits Account Component
  */
 @Component({
   selector: 'mifosx-withdraw-by-client-fixed-deposits-account',
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
index 2c22e4558a..1deb6e6386 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
@@ -2,7 +2,7 @@
 <mifosx-undo-approval-recurring-deposits-account *ngIf="actions['Undo Approval'] || actions['Undo Activation']"></mifosx-undo-approval-recurring-deposits-account>
 <mifosx-approve-recurring-deposits-account *ngIf="actions['Approve']"></mifosx-approve-recurring-deposits-account>
 <mifosx-reject-recurring-deposits-account *ngIf="actions['Reject']"></mifosx-reject-recurring-deposits-account>
-<mifosx-withdraw-by-client-recurring-deposits-account *ngIf="actions['Withdrawn by client']"></mifosx-withdraw-by-client-recurring-deposits-account>
+<mifosx-withdraw-by-client-recurring-deposits-account *ngIf="actions['Withdrawn by Client']"></mifosx-withdraw-by-client-recurring-deposits-account>
 <mifosx-add-charge-recurring-deposits-account *ngIf="actions['Add Charge']"></mifosx-add-charge-recurring-deposits-account>
 <mifosx-premature-close-recurring-deposit-account *ngIf="actions['Premature Close']"></mifosx-premature-close-recurring-deposit-account>
 <mifosx-close-recurring-deposits-account *ngIf="actions['Close']"></mifosx-close-recurring-deposits-account>
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
index 4eec2a8eb5..1816e38f17 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
@@ -16,7 +16,7 @@ export class RecurringDepositsAccountActionsComponent {
     'Undo Approval': boolean
     'Approve': boolean
     'Reject': boolean
-    'Withdrawn by client': boolean
+    'Withdrawn by Client': boolean
     'Add Charge': boolean
     'Premature Close': boolean
     'Close': boolean
@@ -28,7 +28,7 @@ export class RecurringDepositsAccountActionsComponent {
       'Undo Approval': false,
       'Approve': false,
       'Reject': false,
-      'Withdrawn by client': false,
+      'Withdrawn by Client': false,
       'Add Charge': false,
       'Premature Close': false,
       'Close': false,
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.ts
index 4660ef4e69..a45051fa7d 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.ts
@@ -8,7 +8,7 @@ import { Dates } from 'app/core/utils/dates';
 import { RecurringDepositsService } from 'app/deposits/recurring-deposits/recurring-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
 /**
- * Withdraw By Client Recurring Deposits Account Component
+ * Withdrawn by Client Recurring Deposits Account Component
  */
 @Component({
   selector: 'mifosx-withdraw-by-client-recurring-deposits-account',
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
index 0e7af69e60..c66846f672 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
@@ -164,7 +164,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
       case 'Reject':
       case 'Undo Approval':
       case 'Add Charge':
-      case 'Withdrawn by client':
+      case 'Withdrawn by Client':
       case 'Premature Close':
       case 'Close':
       case 'Deposit':
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
index 73ea7d2353..751226441f 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
@@ -128,7 +128,7 @@ export class RecurringDepositsButtonsConfiguration {
             taskPermissionName: 'REJECT_RECURRINGDEPOSITACCOUNT'
           },
           {
-            name: 'Withdrawn by client',
+            name: 'Withdrawn by Client',
             icon: 'arrow-down',
             taskPermissionName: 'WITHDRAW_RECURRINGDEPOSITACCOUNT'
           },
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
index 09e2fa4d66..872002eb72 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
@@ -247,6 +247,12 @@ <h4 fxFlex="98%" class="mat-h4">{{"labels.heading.Moratorium" | translate}} <i c
       <input type="number" matInput formControlName="fixedEmiAmount">
     </mat-form-field>
 
+    <ng-container *ngIf="isDelinquencyEnabled()">
+      <mat-checkbox fxFlex="48%" formControlName="enableInstallmentLevelDelinquency">
+        <p>{{'labels.inputs.Enable installment level Delinquency' | translate}}</p>
+      </mat-checkbox>
+    </ng-container>
+
     <ng-container *ngIf="loansAccountTermsData?.isTopup">
 
       <mat-checkbox fxFlex="20%" formControlName="isTopup">
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
index 73207d16ab..7829922d4d 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
@@ -5,6 +5,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute } from '@angular/router';
 import { LoansAccountAddCollateralDialogComponent } from 'app/loans/custom-dialog/loans-account-add-collateral-dialog/loans-account-add-collateral-dialog.component';
 import { LoanProducts } from 'app/products/loan-products/loan-products';
+import { LoanProduct } from 'app/products/loan-products/models/loan-product.model';
 import { SettingsService } from 'app/settings/settings.service';
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
 import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -86,6 +87,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
   loanId: any = null;
 
   loanScheduleType: OptionData | null = null;
+  loanProduct: LoanProduct | null = null;
 
   /**
    * Create Loans Account Terms Form
@@ -110,6 +112,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         this.loansAccountTermsData = this.loansAccountTemplate;
       }
 
+      if (this.loansAccountTermsData.product) {
+        this.loanProduct = this.loansAccountTermsData.product;
+      }
+
       this.loansAccountTermsForm.patchValue({
         'principalAmount': this.loansAccountTermsData.principal,
         'loanTermFrequency': this.loansAccountTermsData.termFrequency,
@@ -149,7 +155,9 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
           this.totalMultiDisbursed += item.principal;
         });
       }
-
+      if (this.isDelinquencyEnabled()) {
+        this.loansAccountTermsForm.addControl('enableInstallmentLevelDelinquency', new UntypedFormControl(this.loanProduct.enableInstallmentLevelDelinquency));
+      }
       this.collateralDataSource = this.loansAccountTermsData.collateral || [];
 
       const allowAttributeOverrides = this.loansAccountTermsData.product.allowAttributeOverrides;
@@ -502,6 +510,13 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
     }
   }
 
+  isDelinquencyEnabled(): boolean {
+    if (!this.loanProduct || !this.loanProduct.delinquencyBucket) {
+      return false;
+    }
+    return true;
+  }
+
   /**
    * Returns loans account terms form value.
    */
diff --git a/src/app/loans/loans-view/loan-accounts-button-config.ts b/src/app/loans/loans-view/loan-accounts-button-config.ts
index 95677fce4a..4cb2f0a397 100644
--- a/src/app/loans/loans-view/loan-accounts-button-config.ts
+++ b/src/app/loans/loans-view/loan-accounts-button-config.ts
@@ -213,7 +213,7 @@ export class LoansAccountButtonConfiguration {
       case 'Submitted and pending approval':
         this.optionArray = [
           {
-            name: 'Withdrawn by client',
+            name: 'Withdrawn by Client',
             taskPermissionName: 'WITHDRAW_LOAN',
           },
           {
diff --git a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
index 191b41802a..f86ac39a1c 100644
--- a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
+++ b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
@@ -340,7 +340,7 @@ <h3 class="mat-h3" fxFlexFill>{{ 'labels.inputs.Loan Schedule' | translate}}</h3
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Repayment Strategy' | translate}}:</span>
-    <span  fxFlex="53%" class="repayment-strategy">{{ loanProduct.transactionProcessingStrategyName }}</span>
+    <span  fxFlex="53%" class="repayment-strategy">{{ loanProduct.transactionProcessingStrategyName | translateCatalog }}</span>
   </div>
 
   <div fxFlexFill *ngIf="isAdvancedPaymentAllocation">
@@ -404,7 +404,7 @@ <h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Moratorium' | translate}}</h3>
     <span fxFlex="53%">{{ 'labels.inputs.Unassigned' | translate }}</span>
   </div>
 
-  <div fxFlexFill>
+  <div fxFlexFill *ngIf="loanProduct.delinquencyBucket">
     <span fxFlex="47%">{{ 'labels.inputs.Enable installment level Delinquency' | translate}}:</span>
     <span  fxFlex="53%">{{ loanProduct.enableInstallmentLevelDelinquency | yesNo }}</span>
   </div>
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
index 655eedd5ed..d216c99f51 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
@@ -167,7 +167,7 @@ <h4 fxFlex="98%" class="mat-h4 m-r-10">{{'labels.inputs.Moratorium' | translate}
       </button>
     </mat-form-field>
 
-    <mat-checkbox fxFlex="48%" labelPosition="before" formControlName="enableInstallmentLevelDelinquency" class="margin-v">
+    <mat-checkbox fxFlex="48%" labelPosition="before" formControlName="enableInstallmentLevelDelinquency" class="margin-v" *ngIf="loanProductSettingsForm.value.delinquencyBucketId">
       {{'labels.inputs.Enable installment level Delinquency' | translate}}
     </mat-checkbox>
 
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
index b2226a9450..de6c3d60a6 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
@@ -52,7 +52,7 @@ <h4 fxFlex="98%" class="mat-h4">{{'labels.inputs.Principal' | translate}}<i clas
       <mat-label>{{'labels.inputs.Installment day calculation from' | translate}} <i class="fas fa-question" matTooltip="Repayment schedule will start the installment dates from the submitted date or the disbursement date"></i></mat-label>
       <mat-select formControlName="repaymentStartDateType" required>
         <mat-option *ngFor="let repaymentStartDateType of repaymentStartDateTypeOptions" [value]="repaymentStartDateType.id">
-          {{ repaymentStartDateType.value | translate}}
+          {{ repaymentStartDateType.value | translateCatalog}}
         </mat-option>
       </mat-select>
     </mat-form-field>
diff --git a/src/app/savings/saving-account-actions/saving-account-actions.component.html b/src/app/savings/saving-account-actions/saving-account-actions.component.html
index adecb8223e..91b1df4234 100644
--- a/src/app/savings/saving-account-actions/saving-account-actions.component.html
+++ b/src/app/savings/saving-account-actions/saving-account-actions.component.html
@@ -5,7 +5,7 @@
 <mifosx-post-interest-as-on-savings-account *ngIf="actions['Post Interest As On']"></mifosx-post-interest-as-on-savings-account>
 <mifosx-savings-account-assign-staff *ngIf="actions['Assign Staff']"></mifosx-savings-account-assign-staff>
 <mifosx-savings-account-unassign-staff *ngIf="actions['Unassign Staff']"></mifosx-savings-account-unassign-staff>
-<mifosx-withdraw-by-client-savings-account *ngIf="actions['Withdraw By Client']"></mifosx-withdraw-by-client-savings-account>
+<mifosx-withdraw-by-client-savings-account *ngIf="actions['Withdrawn by Client']"></mifosx-withdraw-by-client-savings-account>
 <mifosx-add-charge-savings-account *ngIf="actions['Add Charge']"></mifosx-add-charge-savings-account>
 <mifosx-savings-transactions [currencyCode]="currencyCode" *ngIf="actions['Withdrawal'] || actions['Deposit']"></mifosx-savings-transactions>
 <mifosx-close-savings-account *ngIf="actions['Close']"></mifosx-close-savings-account>
diff --git a/src/app/savings/saving-account-actions/saving-account-actions.component.ts b/src/app/savings/saving-account-actions/saving-account-actions.component.ts
index 52ace98b87..35728a59ba 100644
--- a/src/app/savings/saving-account-actions/saving-account-actions.component.ts
+++ b/src/app/savings/saving-account-actions/saving-account-actions.component.ts
@@ -25,7 +25,7 @@ export class SavingAccountActionsComponent {
     'Assign Staff': boolean
     'Add Charge': boolean
     'Unassign Staff': boolean
-    'Withdraw By Client': boolean
+    'Withdrawn by Client': boolean
     'Apply Annual Fees': boolean
     'Hold Amount': boolean
     'Block Account': boolean
@@ -46,7 +46,7 @@ export class SavingAccountActionsComponent {
     'Assign Staff': false,
     'Add Charge': false,
     'Unassign Staff': false,
-    'Withdraw By Client': false,
+    'Withdrawn by Client': false,
     'Apply Annual Fees': false,
     'Hold Amount': false,
     'Block Account': false,
diff --git a/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.ts b/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.ts
index cb10c44967..b200ad1bbc 100644
--- a/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.ts
+++ b/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.ts
@@ -9,7 +9,7 @@ import { SavingsService } from 'app/savings/savings.service';
 import { SettingsService } from 'app/settings/settings.service';
 
 /**
- * Withdraw By Client Savings Account Component
+ * Withdrawn by Client Savings Account Component
  */
 @Component({
   selector: 'mifosx-withdraw-by-client-savings-account',
diff --git a/src/app/savings/savings-account-view/savings-account-view.component.ts b/src/app/savings/savings-account-view/savings-account-view.component.ts
index be0b942a95..56c99abe20 100644
--- a/src/app/savings/savings-account-view/savings-account-view.component.ts
+++ b/src/app/savings/savings-account-view/savings-account-view.component.ts
@@ -149,7 +149,7 @@ export class SavingsAccountViewComponent implements OnInit {
       case 'Block Deposit':
       case 'Block Withdrawal':
       case 'Unassign Staff':
-      case 'Withdraw By Client':
+      case 'Withdrawn by Client':
       case 'Apply Annual Fees':
         this.router.navigate([`actions/${name}`], { relativeTo: this.route });
         break;
diff --git a/src/app/savings/savings-account-view/savings-buttons.config.ts b/src/app/savings/savings-account-view/savings-buttons.config.ts
index b66e2749f0..8b394b527c 100644
--- a/src/app/savings/savings-account-view/savings-buttons.config.ts
+++ b/src/app/savings/savings-account-view/savings-buttons.config.ts
@@ -169,7 +169,7 @@ export class SavingsButtonsConfiguration {
             taskPermissionName: 'REJECT_SAVINGSACCOUNT'
           },
           {
-            name: 'Withdraw By Client',
+            name: 'Withdrawn by Client',
             taskPermissionName: 'WITHDRAW_SAVINGSACCOUNT'
           },
           {
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index 75c5f9c531..8424f9e362 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Dlužný poplatek",
 	    "Due principal": "Splatná jistina",
 	    "Due interest": "Přiměřený zájem",
-	    "In advanced penalty": "Pokuta předem",
-	    "In advanced fee": "Poplatek předem",
-	    "In advanced principal": "Předem ředitel",
+	    "In advance penalty": "Pokuta předem",
+	    "In advance fee": "Poplatek předem",
+	    "In advance principal": "Předem ředitel",
 	    "In advanced interest": "Zájem předem",
       "Next installment": "Další splátka",
 	    "Last installment": "Poslední splátka",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "SOBOTA",
       "Interest posting": "Zveřejnění zájmu",
       "Amount on hold": "Částka na počkání",
+      "Percentage": "Procento",
+      "Fixed Amount": "Pevná částka",
       "Invalid": "Neplatný"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Zobrazit garanty",
       "Waive Interest": "Vzdát se úroků",
       "Withdrawal": "Vybrání",
-      "Withdrawn by client": "Staženo klientem",
+      "Withdrawn by Client": "Staženo klientem",
       "Write Off": "Odepsat",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index 8035818774..cb8b7cbc99 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Fällige Gebühr",
 	    "Due principal": "Fälliger Auftraggeber",
 	    "Due interest": "Geschuldete Zinsen",
-	    "In advanced penalty": "Vorabstrafe",
-	    "In advanced fee": "Gebühr im Voraus",
-	    "In advanced principal": "Im Voraus Auftraggeber",
+	    "In advance penalty": "Vorabstrafe",
+	    "In advance fee": "Gebühr im Voraus",
+	    "In advance principal": "Im Voraus Auftraggeber",
 	    "In advanced interest": "Im Voraus Zinsen",
       "Next installment": "Nächste Folge",
 	    "Last installment": "Letzte Rate",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "SAMSTAG",
       "Interest posting": "Zinsbuchung",
       "Amount on hold": "Zurückgestellter Betrag",
+      "Percentage": "Prozentsatz",
+      "Fixed Amount": "Fester Betrag",
       "Invalid": "Ungültig"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Garanten anzeigen",
       "Waive Interest": "Verzichten Sie auf Zinsen",
       "Withdrawal": "Rückzug",
-      "Withdrawn by client": "Vom Kunden zurückgezogen",
+      "Withdrawn by Client": "Vom Kunden zurückgezogen",
       "Write Off": "Abschreiben",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 7cee3b6a04..cd31091f28 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -603,9 +603,9 @@
             "Due fee": "Due fee",
             "Due principal": "Due principal",
             "Due interest": "Due interest",
-            "In advanced penalty": "In advanced penalty",
-            "In advanced fee": "In advanced fee",
-            "In advanced principal": "In advanced principal",
+            "In advance penalty": "In advance penalty",
+            "In advance fee": "In advance fee",
+            "In advance principal": "In advance principal",
             "In advanced interest": "In advanced interest",
             "Next installment": "Next installment",
 	        "Last installment": "Last installment",
@@ -646,6 +646,8 @@
             "SATURDAY": "SATURDAY",
             "Interest posting": "Interest posting",	
             "Amount on hold": "Amount on hold",
+            "Percentage": "Percentage",
+            "Fixed Amount": "Fixed Amount",
             "Invalid": "Invalid"
         },
         "commons": {
@@ -2407,7 +2409,7 @@
             "View Guarantors": "View Guarantors",
             "Waive Interest": "Waive Interest",
             "Withdrawal": "Withdrawal",
-            "Withdrawn by client": "Withdrawn by client",
+            "Withdrawn by Client": "Withdrawn by Client",
             "Write Off": "Write Off",
             "XBRL": "XBRL"
         },
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index b9482eac8c..c2bf327bba 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -529,9 +529,9 @@
             "Regular": "Regular",
             "Account transfer": "Transferencia de cuenta",
             "Flat": "Monto fijo",
-            "% Amount": "% Monto del Crédito",
+            "% Amount": "% Monto",
             "% Interest": "% Interés",
-            "% Loan Amount + Interest": "Monto del Crédito + Interés",
+            "% Loan Amount + Interest": "% Monto del Crédito + Interés",
             "Disbursement": "Desembolso",
             "Specified due date": "Fecha de Vencimiento",
             "Installment Fee": "Cuota de pago",
@@ -603,9 +603,9 @@
             "Due fee": "Vencimiento de Comisión",
             "Due principal": "Vencimiento de Capital",
             "Due interest": "Vencimiento de interés",
-            "In advanced penalty": "Penalización anticipada",
-            "In advanced fee": "Comisión anticipada",
-            "In advanced principal": "Capital anticipado",
+            "In advance penalty": "Penalización anticipada",
+            "In advance fee": "Comisión anticipada",
+            "In advance principal": "Capital anticipado",
             "In advanced interest": "interés anticipado",
             "Next installment": "Próxima cuota",
             "Last installment": "Última cuota",
@@ -646,6 +646,8 @@
             "SATURDAY": "SÁBADO",
             "Interest posting": "Intereses",	
             "Amount on hold": "Retención",
+            "Percentage": "Porcentaje",
+            "Fixed Amount": "Cantidad fija",
             "Invalid": "Inválido"
         },
         "commons": {
@@ -1176,7 +1178,7 @@
             "Bussiness Rule": "De reglas de negocio",
             "CAMPAIGN": "CAMPAÑA",
             "CHARGES": "CARGOS",
-            "COB Date": "Fecha de mazorca",
+            "COB Date": "Fecha de Cierre",
             "CSV format": "formato CSV",
             "CURRENCY": "MONEDA",
             "Calculate interest for exact days in partial period": "Calcular intereses por días exactos en periodo parcial",
@@ -2408,7 +2410,7 @@
             "View Guarantors": "Ver garantes",
             "Waive Interest": "Renunciar a intereses",
             "Withdrawal": "Retiro",
-            "Withdrawn by client": "Retirado por el cliente",
+            "Withdrawn by Client": "Retirado por el cliente",
             "Write Off": "Cancelar crédito",
             "XBRL": "XBRL"
         },
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index d862f57dd6..6757a05dea 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Frais dus",
 	    "Due principal": "Principal dû",
 	    "Due interest": "Intérêts dus",
-	    "In advanced penalty": "Pénalité anticipée",
-	    "In advanced fee": "Frais d'avance",
-	    "In advanced principal": "À l'avance, le principal",
+	    "In advance penalty": "Pénalité anticipée",
+	    "In advance fee": "Frais d'avance",
+	    "In advance principal": "À l'avance, le principal",
 	    "In advanced interest": "Intérêts d'avance",
       "Next installment": "Prochain versement",
 	    "Last installment": "Dernier versement",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "SAMEDI",
       "Interest posting": "Publication d'intérêt",
       "Amount on hold": "Montant retenu",
+      "Percentage": "Pourcentage",
+      "Fixed Amount": "Montant fixé",
       "Invalid": "Invalide"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Voir les garants",
       "Waive Interest": "Renoncer aux intérêts",
       "Withdrawal": "Retrait",
-      "Withdrawn by client": "Retiré par le client",
+      "Withdrawn by Client": "Retiré par le client",
       "Write Off": "Radier",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 5d74dd8009..f9441b4ae0 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Tariffa dovuta",
 	    "Due principal": "Principale dovuto",
 	    "Due interest": "Interessi dovuti",
-	    "In advanced penalty": "Pena anticipata",
-	    "In advanced fee": "Pagamento anticipato",
-	    "In advanced principal": "In anticipo principale",
+	    "In advance penalty": "Pena anticipata",
+	    "In advance fee": "Pagamento anticipato",
+	    "In advance principal": "In anticipo principale",
 	    "In advanced interest": "Interessi anticipati",
       "Next installment": "Prossima puntata",
 	    "Last installment": "Ultima puntata",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "SABATO",
       "Interest posting": "Pubblicazione di interessi",
       "Amount on hold": "Importo sospeso",
+      "Percentage": "Percentuale",
+      "Fixed Amount": "Importo fisso",
       "Invalid": "Non valido"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Visualizza i Garanti",
       "Waive Interest": "Rinuncia agli interessi",
       "Withdrawal": "Ritiro",
-      "Withdrawn by client": "Ritirato dal cliente",
+      "Withdrawn by Client": "Ritirato dal cliente",
       "Write Off": "Cancellare",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 8b2686b58d..c61c491996 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -603,9 +603,9 @@
 	    "Due fee": "납부 수수료",
 	    "Due principal": "교장",
 	    "Due interest": "정당한 관심",
-	    "In advanced penalty": "사전 패널티",
-	    "In advanced fee": "선불요금",
-	    "In advanced principal": "사전 교장",
+	    "In advance penalty": "사전 패널티",
+	    "In advance fee": "선불요금",
+	    "In advance principal": "사전 교장",
 	    "In advanced interest": "사전이자",
       "Next installment": "다음 편",
 	    "Last installment": "마지막 할부",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "토요일",
       "Interest posting": "관심 게시",
       "Amount on hold": "보류 금액",
+      "Percentage": "백분율",
+      "Fixed Amount": "정액",
       "Invalid": "유효하지 않은"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "보증인 보기",
       "Waive Interest": "이자 면제",
       "Withdrawal": "철수",
-      "Withdrawn by client": "고객이 철회함",
+      "Withdrawn by Client": "고객이 철회함",
       "Write Off": "상각",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index b3ab6c9b99..7f63fe5fc0 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Mokamas mokestis",
 	    "Due principal": "Mokėtas pagrindinis",
 	    "Due interest": "Deramas palūkanas",
-	    "In advanced penalty": "Išankstinė bauda",
-	    "In advanced fee": "Išankstinis mokestis",
-	    "In advanced principal": "Iš anksto pagrindinis",
+	    "In advance penalty": "Išankstinė bauda",
+	    "In advance fee": "Išankstinis mokestis",
+	    "In advance principal": "Iš anksto pagrindinis",
 	    "In advanced interest": "Iš anksto palūkanas",
       "Next installment": "Kita įmoka",
 	    "Last installment": "Paskutinė įmoka",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "ŠEŠTADIENIS",
       "Interest posting": "Interesų skelbimas",
       "Amount on hold": "Sulaikyta suma",
+      "Percentage": "Procentas",
+      "Fixed Amount": "Nustatyta suma",
       "Invalid": "Neteisinga"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Žiūrėti garantus",
       "Waive Interest": "Atsisakyti palūkanų",
       "Withdrawal": "Pasitraukimas",
-      "Withdrawn by client": "Atsiėmė klientas",
+      "Withdrawn by Client": "Atsiėmė klientas",
       "Write Off": "Nusirašinėti",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 1dd7dc04f4..28ca8b4af3 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Maksājamā maksa",
 	    "Due principal": "Maksājamais pamatsumma",
 	    "Due interest": "Pienācīgi procenti",
-	    "In advanced penalty": "Priekšsods",
-	    "In advanced fee": "Iepriekš samaksā",
-	    "In advanced principal": "Avansā galvenais",
+	    "In advance penalty": "Priekšsods",
+	    "In advance fee": "Iepriekš samaksā",
+	    "In advance principal": "Avansā galvenais",
 	    "In advanced interest": "Iepriekš procentos",
       "Next installment": "Nākamā iemaksa",
 	    "Last installment": "Pēdējā iemaksa",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "SESTDIENA",
       "Interest posting": "Interešu publicēšana",
       "Amount on hold": "Aizturētā summa",
+      "Percentage": "Procenti",
+      "Fixed Amount": "Fiksēta summa",
       "Invalid": "Nederīgs"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Skatīt galvotājus",
       "Waive Interest": "Atteikties no procentiem",
       "Withdrawal": "Izņemšana",
-      "Withdrawn by client": "Izņēmis klients",
+      "Withdrawn by Client": "Izņēmis klients",
       "Write Off": "Norakstīt",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index 3644e327c2..9a15c74015 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -603,9 +603,9 @@
 	    "Due fee": "देय शुल्क",
 	    "Due principal": "देय प्रिन्सिपल",
 	    "Due interest": "देय ब्याज",
-	    "In advanced penalty": "अग्रिम जरिवाना",
-	    "In advanced fee": "अग्रिम शुल्कमा",
-	    "In advanced principal": "अग्रिम प्रिन्सिपल",
+	    "In advance penalty": "अग्रिम जरिवाना",
+	    "In advance fee": "अग्रिम शुल्कमा",
+	    "In advance principal": "अग्रिम प्रिन्सिपल",
 	    "In advanced interest": "अग्रिम ब्याजमा",
       "Next installment": "अर्को किस्ता",
 	    "Last installment": "अन्तिम किस्ता",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "शनिबार",
       "Interest posting": "चासो पोस्टिंग",
       "Amount on hold": "होल्डमा रहेको रकम",
+      "Percentage": "प्रतिशत",
+      "Fixed Amount": "निश्चित रकम",
       "Invalid": "अवैध"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "ग्यारेन्टरहरू हेर्नुहोस्",
       "Waive Interest": "ब्याज माफ गर्नुहोस्",
       "Withdrawal": "फिर्ता",
-      "Withdrawn by client": "ग्राहक द्वारा फिर्ता",
+      "Withdrawn by Client": "ग्राहक द्वारा फिर्ता",
       "Write Off": "लेख्नुहोस्",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index b537cd2a0c..c12f019460 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Taxa devida",
 	    "Due principal": "Principal devido",
 	    "Due interest": "Juros devidos",
-	    "In advanced penalty": "Penalidade antecipada",
-	    "In advanced fee": "Taxa antecipada",
-	    "In advanced principal": "Antecipadamente principal",
+	    "In advance penalty": "Penalidade antecipada",
+	    "In advance fee": "Taxa antecipada",
+	    "In advance principal": "Antecipadamente principal",
 	    "In advanced interest": "Juros antecipados",
       "Next installment": "Próxima parcela",
 	    "Last installment": "Última parcela",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "SÁBADO",
       "Interest posting": "Postagem de interesse",
       "Amount on hold": "Valor retido",
+      "Percentage": "Percentagem",
+      "Fixed Amount": "Quantia fixa",
       "Invalid": "Inválido"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Ver Fiadores",
       "Waive Interest": "Renunciar a juros",
       "Withdrawal": "Cancelamento",
-      "Withdrawn by client": "Retirado pelo cliente",
+      "Withdrawn by Client": "Retirado pelo cliente",
       "Write Off": "Eliminar",
       "XBRL": "XBRL"
     },
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index beab022d4d..a923f8fad6 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -603,9 +603,9 @@
 	    "Due fee": "Ada inayodaiwa",
 	    "Due principal": "Malipo mkuu",
 	    "Due interest": "Nia inayostahili",
-	    "In advanced penalty": "Adhabu ya mapema",
-	    "In advanced fee": "Ada ya mapema",
-	    "In advanced principal": "Mapema mkuu",
+	    "In advance penalty": "Adhabu ya mapema",
+	    "In advance fee": "Ada ya mapema",
+	    "In advance principal": "Mapema mkuu",
 	    "In advanced interest": "Maslahi ya mapema",
       "Next installment": "Awamu inayofuata",
 	    "Last installment": "Awamu ya mwisho",
@@ -646,6 +646,8 @@
 	    "SATURDAY": "JUMAMOSI",
       "Interest posting": "Nia ya kuchapisha",
       "Amount on hold": "Kiasi kilichohifadhiwa",
+      "Percentage": "Asilimia",
+      "Fixed Amount": "Kiasi kisichobadilika",
       "Invalid": "Batili"
     },
     "commons": {
@@ -2408,7 +2410,7 @@
       "View Guarantors": "Tazama Wadhamini",
       "Waive Interest": "Ondoa Maslahi",
       "Withdrawal": "Uondoaji",
-      "Withdrawn by client": "Imetolewa na mteja",
+      "Withdrawn by Client": "Imetolewa na mteja",
       "Write Off": "Andika",
       "XBRL": "XBRL"
     },