diff --git a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts
index b4642f4eb8..1553ad59a6 100644
--- a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts
+++ b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts
@@ -57,11 +57,11 @@ export class ViewAccountTransferComponent {
   }
 
   transferToClient(toClient: any): string {
-    return `/#/clients/${toClient.id}`;
+    return `/#/members/${toClient.id}`;
   }
 
   transferToAccount(toClient: any, toAccount: any): string {
-    return `/#/clients/${toClient.id}/savings-accounts/${toAccount.id}`;
+    return `/#/members/${toClient.id}/savings-accounts/${toAccount.id}`;
   }
 
   goBack(): void {
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index c7db7a8627..be21dd9cba 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -33,7 +33,7 @@ const routes: Routes = [
     loadChildren: () => import('./centers/centers.module').then((m) => m.CentersModule)
   },
   {
-    path: 'clients',
+    path: 'members',
     loadChildren: () => import('./clients/clients.module').then((m) => m.ClientsModule)
   },
   {
diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
index ba69c7b133..56e9febae4 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
@@ -8,7 +8,8 @@
 
 <form [formGroup]="createClientForm">
   <div class="layout-row-wrap gap-2px responsive-column">
-    <mat-form-field class="flex-fill flex-23">
+    <!-- Row 1: Office, Legal Form, External Id, First Name / Middle Name (or Full Name for Entity) -->
+    <mat-form-field class="flex-20">
       <mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
       <mat-select required formControlName="officeId">
         @for (office of officeOptions; track office) {
@@ -25,7 +26,7 @@
       }
     </mat-form-field>
 
-    <mat-form-field class="flex-fill flex-23">
+    <mat-form-field class="flex-15">
       <mat-label>{{ 'labels.inputs.Legal Form' | translate }}</mat-label>
       <mat-select required formControlName="legalFormId">
         @for (legalForm of legalFormOptions; track legalForm) {
@@ -36,7 +37,7 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field class="flex-fill flex-23">
+    <mat-form-field class="flex-20">
       <mat-label>{{ 'labels.inputs.External Id' | translate }}</mat-label>
       <input matInput formControlName="externalId" />
       @if (!externalNationalIdService.isLoading && externalNationalIdService.statusMessageKey) {
@@ -55,7 +56,7 @@
     </mat-form-field>
 
     @if (createClientForm.get('fullname')) {
-      <mat-form-field class="flex-48">
+      <mat-form-field class="flex-40">
         <mat-label>
           {{ 'labels.inputs.' + getDateLabel(createClientForm.value.legalFormId, ['Name', 'Entity Name']) | translate }}
         </mat-label>
@@ -75,65 +76,62 @@
       </mat-form-field>
     }
 
-    @if (createClientForm.get('firstname') || createClientForm.get('middlename') || createClientForm.get('lastname')) {
-      <div class="name-fields-row">
-        @if (createClientForm.get('firstname')) {
-          <mat-form-field class="name-field first-name">
-            <mat-label>{{ 'labels.inputs.First Name' | translate }}</mat-label>
-            <input matInput required formControlName="firstname" />
-            @if (createClientForm.controls.firstname.hasError('required')) {
-              <mat-error>
-                {{ 'labels.inputs.Client first name' | translate }} {{ 'labels.commons.is' | translate }}
-                <strong>{{ 'labels.commons.required' | translate }}</strong>
-              </mat-error>
-            }
-            @if (createClientForm.controls.firstname.hasError('pattern')) {
-              <mat-error>
-                {{ 'labels.inputs.Client first name' | translate }}
-                <strong>{{ 'labels.inputs.cannot' | translate }}</strong>
-                {{ 'labels.commons.begin with a special character or number' | translate }}
-              </mat-error>
-            }
-          </mat-form-field>
+    @if (createClientForm.get('firstname')) {
+      <mat-form-field class="flex-20">
+        <mat-label>{{ 'labels.inputs.First Name' | translate }}</mat-label>
+        <input matInput required formControlName="firstname" />
+        @if (createClientForm.controls.firstname.hasError('required')) {
+          <mat-error>
+            {{ 'labels.inputs.Client first name' | translate }} {{ 'labels.commons.is' | translate }}
+            <strong>{{ 'labels.commons.required' | translate }}</strong>
+          </mat-error>
         }
-        @if (createClientForm.get('middlename')) {
-          <mat-form-field class="name-field middle-name">
-            <mat-label>{{ 'labels.inputs.Middle Name' | translate }}</mat-label>
-            <input matInput formControlName="middlename" />
-            @if (createClientForm.controls.middlename.hasError('pattern')) {
-              <mat-error>
-                {{ 'labels.inputs.Client middle name' | translate }}
-                <strong>{{ 'labels.inputs.cannot' | translate }}</strong>
-                {{ 'labels.commons.begin with a special character or number' | translate }}
-              </mat-error>
-            }
-          </mat-form-field>
+        @if (createClientForm.controls.firstname.hasError('pattern')) {
+          <mat-error>
+            {{ 'labels.inputs.Client first name' | translate }}
+            <strong>{{ 'labels.inputs.cannot' | translate }}</strong>
+            {{ 'labels.commons.begin with a special character or number' | translate }}
+          </mat-error>
         }
-        @if (createClientForm.get('lastname')) {
-          <mat-form-field class="name-field last-name">
-            <mat-label>{{ 'labels.inputs.Last Name' | translate }}</mat-label>
-            <input matInput required formControlName="lastname" />
-            @if (createClientForm.controls.lastname.hasError('required')) {
-              <mat-error>
-                {{ 'labels.inputs.Client last name' | translate }} {{ 'labels.commons.is' | translate }}
-                <strong>{{ 'labels.commons.required' | translate }}</strong>
-              </mat-error>
-            }
-            @if (createClientForm.controls.lastname.hasError('pattern')) {
-              <mat-error>
-                {{ 'labels.inputs.Client last name' | translate }}
-                <strong>{{ 'labels.inputs.cannot' | translate }}</strong>
-                {{ 'labels.commons.begin with a special character or number' | translate }}
-              </mat-error>
-            }
-          </mat-form-field>
+      </mat-form-field>
+    }
+
+    @if (createClientForm.get('middlename')) {
+      <mat-form-field class="flex-20">
+        <mat-label>{{ 'labels.inputs.Middle Name' | translate }}</mat-label>
+        <input matInput formControlName="middlename" />
+        @if (createClientForm.controls.middlename.hasError('pattern')) {
+          <mat-error>
+            {{ 'labels.inputs.Client middle name' | translate }}
+            <strong>{{ 'labels.inputs.cannot' | translate }}</strong>
+            {{ 'labels.commons.begin with a special character or number' | translate }}
+          </mat-error>
         }
-      </div>
+      </mat-form-field>
     }
 
-    <mat-divider></mat-divider>
+    <!-- Row 2: Last Name, Date of Birth, Gender, Staff, Is Staff? -->
+    @if (createClientForm.get('lastname')) {
+      <mat-form-field class="flex-20">
+        <mat-label>{{ 'labels.inputs.Last Name' | translate }}</mat-label>
+        <input matInput required formControlName="lastname" />
+        @if (createClientForm.controls.lastname.hasError('required')) {
+          <mat-error>
+            {{ 'labels.inputs.Client last name' | translate }} {{ 'labels.commons.is' | translate }}
+            <strong>{{ 'labels.commons.required' | translate }}</strong>
+          </mat-error>
+        }
+        @if (createClientForm.controls.lastname.hasError('pattern')) {
+          <mat-error>
+            {{ 'labels.inputs.Client last name' | translate }}
+            <strong>{{ 'labels.inputs.cannot' | translate }}</strong>
+            {{ 'labels.commons.begin with a special character or number' | translate }}
+          </mat-error>
+        }
+      </mat-form-field>
+    }
 
-    <mat-form-field class="flex-48" (click)="dateOfBirthDatePicker.open()">
+    <mat-form-field class="flex-20" (click)="dateOfBirthDatePicker.open()">
       <mat-label>
         {{
           'labels.inputs.' + getDateLabel(createClientForm.value.legalFormId, ['Date of Birth', 'Incorporation Date'])
@@ -191,7 +189,7 @@
     }
 
     @if (createClientForm.value.legalFormId === LegalFormId.PERSON) {
-      <mat-form-field class="flex-48">
+      <mat-form-field class="flex-15">
         <mat-label>{{ 'labels.inputs.Gender' | translate }}</mat-label>
         <mat-select formControlName="genderId">
           @for (gender of genderOptions; track gender) {
@@ -203,7 +201,7 @@
       </mat-form-field>
     }
 
-    <mat-form-field class="flex-48">
+    <mat-form-field class="flex-23">
       <mat-label>{{ 'labels.inputs.Staff' | translate }}</mat-label>
       <mat-select formControlName="staffId">
         @for (staff of staffOptions; track staff) {
@@ -215,19 +213,20 @@
     </mat-form-field>
 
     @if (createClientForm.value.legalFormId === LegalFormId.PERSON) {
-      <mat-checkbox class="flex-48 margin-v" labelPosition="before" formControlName="isStaff">
+      <mat-checkbox class="flex-15 margin-v" labelPosition="before" formControlName="isStaff">
         {{ 'labels.inputs.Is staff' | translate }}?
       </mat-checkbox>
     }
 
     <mat-divider class="flex-98"></mat-divider>
 
-    <mat-form-field class="flex-48">
+    <!-- Row 3: Mobile No, Email Address, Client Type, Client Classification -->
+    <mat-form-field class="flex-20">
       <mat-label>{{ 'labels.inputs.Mobile No' | translate }}</mat-label>
       <input matInput type="text" formControlName="mobileNo" />
     </mat-form-field>
 
-    <mat-form-field class="flex-48">
+    <mat-form-field class="flex-30">
       <mat-label>{{ 'labels.inputs.Email Address' | translate }}</mat-label>
       <input matInput formControlName="emailAddress" />
       @if (createClientForm.controls.emailAddress.errors?.email) {
@@ -237,7 +236,7 @@
       }
     </mat-form-field>
 
-    <mat-form-field class="flex-48">
+    <mat-form-field class="flex-23">
       <mat-label>{{ 'labels.inputs.Client Type' | translate }}</mat-label>
       <mat-select formControlName="clientTypeId">
         @for (clientType of clientTypeOptions; track clientType) {
@@ -248,7 +247,7 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field class="flex-48">
+    <mat-form-field class="flex-23">
       <mat-label>{{ 'labels.inputs.Client Classification' | translate }}</mat-label>
       <mat-select formControlName="clientClassificationId">
         @for (clientClassification of clientClassificationTypeOptions; track clientClassification) {
@@ -259,7 +258,8 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field class="flex-48" (click)="submittedOnDatePicker.open()">
+    <!-- Row 4: Submitted On, Active?, Activation Date, Open Savings Account?, Savings Product -->
+    <mat-form-field class="flex-20" (click)="submittedOnDatePicker.open()">
       <mat-label>{{ 'labels.inputs.Submitted On' | translate }}</mat-label>
       <input
         matInput
@@ -273,14 +273,12 @@
       <mat-datepicker #submittedOnDatePicker></mat-datepicker>
     </mat-form-field>
 
-    <br />
-
-    <mat-checkbox labelPosition="before" formControlName="active" class="margin-v flex-48">
+    <mat-checkbox labelPosition="before" formControlName="active" class="margin-v flex-10">
       {{ 'labels.inputs.Active' | translate }}?
     </mat-checkbox>
 
     @if (createClientForm.contains('activationDate')) {
-      <mat-form-field class="flex-48" (click)="activatedOnDatePicker.open()">
+      <mat-form-field class="flex-20" (click)="activatedOnDatePicker.open()">
         <mat-label>{{ 'labels.inputs.Activation Date' | translate }}</mat-label>
         <input
           matInput
@@ -301,12 +299,12 @@
       </mat-form-field>
     }
 
-    <mat-checkbox labelPosition="before" formControlName="addSavings" class="margin-v flex-48">
+    <mat-checkbox labelPosition="before" formControlName="addSavings" class="margin-v flex-10">
       {{ 'labels.inputs.Open Savings Account' | translate }}?
     </mat-checkbox>
 
     @if (createClientForm.contains('savingsProductId')) {
-      <mat-form-field class="flex-48">
+      <mat-form-field class="flex-20">
         <mat-label>{{ 'labels.inputs.Savings Product' | translate }}</mat-label>
         <mat-select required formControlName="savingsProductId">
           @for (product of savingProductOptions; track product) {
diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.scss b/src/app/clients/client-stepper/client-general-step/client-general-step.component.scss
index c70f269b73..5e52d94090 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.scss
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.scss
@@ -14,6 +14,18 @@ form {
   }
 }
 
+.flex-10 {
+  flex: 0 0 10%;
+}
+
+.flex-15 {
+  flex: 0 0 15%;
+}
+
+.flex-22 {
+  flex: 0 0 22%;
+}
+
 mat-form-field {
   margin-bottom: 8px;
 }
diff --git a/src/app/clients/clients-routing.module.ts b/src/app/clients/clients-routing.module.ts
index aebcc36ac4..5ee0779e92 100644
--- a/src/app/clients/clients-routing.module.ts
+++ b/src/app/clients/clients-routing.module.ts
@@ -68,7 +68,7 @@ const routes: Routes = [
         },
         {
           path: 'create',
-          data: { title: 'Create Client', breadcrumb: 'Create Client', routeParamBreadcrumb: false },
+          data: { title: 'Create Member', breadcrumb: 'Create Member', routeParamBreadcrumb: false },
           component: CreateClientComponent,
           resolve: {
             clientAddressFieldConfig: ClientAddressFieldConfigurationResolver,
@@ -78,7 +78,7 @@ const routes: Routes = [
         {
           path: ':clientId',
           component: ClientsViewComponent,
-          data: { title: 'Clients View', routeParamBreadcrumb: 'clientId' },
+          data: { title: 'Members View', routeParamBreadcrumb: 'clientId' },
           resolve: {
             clientViewData: ClientViewResolver,
             clientTemplateData: ClientTemplateResolver,
diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts
index 5dfdc4c134..e95076c8d7 100644
--- a/src/app/clients/clients-view/clients-view.component.ts
+++ b/src/app/clients/clients-view/clients-view.component.ts
@@ -270,7 +270,7 @@ export class ClientsViewComponent implements OnInit {
    */
   reload() {
     const url: string = this.router.url;
-    this.router.navigateByUrl(`/clients`, { skipLocationChange: true }).then(() => this.router.navigate([url]));
+    this.router.navigateByUrl(`/members`, { skipLocationChange: true }).then(() => this.router.navigate([url]));
   }
 
   /**
@@ -286,7 +286,7 @@ export class ClientsViewComponent implements OnInit {
       }
       if (response.delete) {
         this.clientsService.deleteClient(this.clientViewData.id).subscribe(() => {
-          this.router.navigate(['/clients'], { relativeTo: this.route });
+          this.router.navigate(['/members'], { relativeTo: this.route });
         });
       }
     });
diff --git a/src/app/collaterals/view-collateral/view-collateral.component.html b/src/app/collaterals/view-collateral/view-collateral.component.html
index 1efb8d7d49..971b2a5f94 100644
--- a/src/app/collaterals/view-collateral/view-collateral.component.html
+++ b/src/app/collaterals/view-collateral/view-collateral.component.html
@@ -69,7 +69,7 @@ <h3>{{ 'labels.heading.Transaction Details' | translate }}</h3>
         </ng-container>
 
         <!-- <tr mat-header-row *matHeaderRowDef="clientMemberColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: clientMemberColumns;" [routerLink]="['/clients', row.id, 'loans-accounts', 'create']" class="select-row"></tr> -->
+            <tr mat-row *matRowDef="let row; columns: clientMemberColumns;" [routerLink]="['/members', row.id, 'loans-accounts', 'create']" class="select-row"></tr> -->
         <tr mat-header-row *matHeaderRowDef="collateralColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: collateralColumns"></tr>
       </table>
diff --git a/src/app/core/authentication/authentication.service.ts b/src/app/core/authentication/authentication.service.ts
index a256e92773..edb5dfac4b 100644
--- a/src/app/core/authentication/authentication.service.ts
+++ b/src/app/core/authentication/authentication.service.ts
@@ -66,7 +66,6 @@ export class AuthenticationService {
    */
   private storage: Storage = sessionStorage;
   private credentials: Credentials;
-  private dialogShown = false;
   private authMode: AuthMode = AuthMode.Basic;
 
   /** Promise that resolves once the OIDC discovery document has been loaded. */
@@ -372,7 +371,6 @@ export class AuthenticationService {
 
     this.authenticationInterceptor.removeAuthorization();
     this.setCredentials();
-    this.resetDialog();
     this.userLoggedIn$.next(false);
 
     if (this.authMode === AuthMode.OIDC) {
@@ -481,18 +479,6 @@ export class AuthenticationService {
     return this.http.get('/twofactor');
   }
 
-  showDialog() {
-    this.dialogShown = true;
-  }
-
-  resetDialog() {
-    this.dialogShown = false;
-  }
-
-  hasDialogBeenShown() {
-    return this.dialogShown;
-  }
-
   /**
    * Requests OTP to be sent via the given delivery method.
    * @param {any} deliveryMethod Delivery method for the OTP.
diff --git a/src/app/core/shell/sidenav/sidenav.component.html b/src/app/core/shell/sidenav/sidenav.component.html
index 90ec61a93c..a750ccce97 100644
--- a/src/app/core/shell/sidenav/sidenav.component.html
+++ b/src/app/core/shell/sidenav/sidenav.component.html
@@ -15,7 +15,6 @@
   <div class="navigation-panel layout-column">
     <!-- TODO: Allow customization by organization -->
     <div class="app-brand" [routerLink]="['/home']">
-      <img src="assets/images/MifosX_logo.png" alt="app-logo" class="app-logo" />
       <span #logo class="app-logo-text text-muted">{{ 'APP_NAME' | translate }}</span>
     </div>
 
diff --git a/src/app/core/shell/toolbar/toolbar.component.html b/src/app/core/shell/toolbar/toolbar.component.html
index 67f05ac866..872b1d0316 100644
--- a/src/app/core/shell/toolbar/toolbar.component.html
+++ b/src/app/core/shell/toolbar/toolbar.component.html
@@ -42,12 +42,17 @@
       [matMenuTriggerFor]="institutionMenu"
       #institutionMenuTrigger="matMenuTrigger"
       tabindex="0"
-      *mifosxHasPermission="['READ_CLIENT', 'READ_GROUP', 'READ_CENTER']"
+      *mifosxHasPermission="['READ_GROUP', 'READ_CENTER']"
     >
       <fa-icon class="mr-05" icon="university" size="lg"></fa-icon>
       {{ 'labels.menus.Institution' | translate }}
     </a>
 
+    <a class="tab-link" [routerLink]="['/members']" tabindex="0" *mifosxHasPermission="'READ_CLIENT'">
+      <fa-icon class="mr-05" icon="users" size="lg"></fa-icon>
+      {{ 'labels.menus.Clients' | translate }}
+    </a>
+
     <span class="hide-lt-md">
       <a
         #accounting
@@ -100,29 +105,10 @@
     <mifosx-search-tool tabindex="0"></mifosx-search-tool>
   </div>
 
-  <div #languageSelector class="white-text-language">
-    <mifosx-language-selector class="ml-1 language hide-lt-md" tabindex="0"></mifosx-language-selector>
-  </div>
-
-  <button
-    mat-icon-button
-    [matMenuTriggerFor]="languageMenu"
-    class="show-lt-md"
-    tabindex="0"
-    [attr.aria-label]="'labels.menus.Language Selector' | translate"
-    matTooltip="{{ 'labels.menus.Language Selector' | translate }}"
-  >
-    <mat-icon>language</mat-icon>
-  </button>
-
   <div #notifications>
     <mifosx-notifications-tray #notificationsTray class="hide-lt-md" tabindex="0"></mifosx-notifications-tray>
   </div>
 
-  <div #themeToggle>
-    <mifosx-theme-toggle tabindex="0"></mifosx-theme-toggle>
-  </div>
-
   <div #appMenu>
     <button mat-icon-button class="ml-1 img-button" [matMenuTriggerFor]="applicationMenu" tabindex="0">
       <img src="assets/images/user_placeholder.png" [alt]="'labels.headings.User Profile' | translate" />
@@ -130,48 +116,13 @@
   </div>
 </mat-toolbar>
 
-<!-- Language selector menu for small screen view -->
-<mat-menu #languageMenu="matMenu">
-  <mifosx-language-selector class="ml-1 language"></mifosx-language-selector>
-</mat-menu>
-
 <mat-menu #institutionMenu="matMenu" [overlapTrigger]="false">
-  <button mat-menu-item routerLink="/clients" tabindex="0" *mifosxHasPermission="'READ_CLIENT'">
-    {{ 'labels.menus.Clients' | translate }}
-  </button>
   <button mat-menu-item routerLink="/groups" tabindex="0" *mifosxHasPermission="'READ_GROUP'">
     {{ 'labels.menus.Groups' | translate }}
   </button>
   <button mat-menu-item routerLink="/centers" tabindex="0" *mifosxHasPermission="'READ_CENTER'">
     {{ 'labels.menus.Centers' | translate }}
   </button>
-  <span class="hide-lt-md">
-    <button
-      mat-menu-item
-      [routerLink]="['/accounting']"
-      tabindex="0"
-      *mifosxHasPermission="[
-        'READ_JOURNALENTRY',
-        'READ_GLACCOUNT',
-        'READ_GLCLOSURE',
-        'READ_ACCOUNTINGRULE',
-        'READ_PROVISIONINGCRITERIA'
-      ]"
-    >
-      {{ 'labels.menus.Accounting' | translate }}
-    </button>
-    <button mat-menu-item [matMenuTriggerFor]="reportsMenu" tabindex="0" *mifosxHasPermission="'READ_REPORT'">
-      {{ 'labels.menus.Reports' | translate }}
-    </button>
-    <button
-      mat-menu-item
-      [matMenuTriggerFor]="adminMenu"
-      tabindex="0"
-      *mifosxHasPermission="['READ_USER', 'READ_ROLE']"
-    >
-      {{ 'labels.menus.Admin' | translate }}
-    </button>
-  </span>
 </mat-menu>
 
 <!-- Toolbar Menus -->
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts
index 04405d9282..434536cf78 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts
@@ -303,7 +303,7 @@ export class ChargesTabComponent implements OnInit {
     const clientId = this.fixedDepositsAccountData.clientId;
     const url: string = this.router.url;
     this.router
-      .navigateByUrl(`/clients/${clientId}/fixed-deposits-accounts`, { skipLocationChange: true })
+      .navigateByUrl(`/members/${clientId}/fixed-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 }
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 a7971339c0..ff41497c31 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
@@ -149,7 +149,7 @@ export class FixedDepositAccountViewComponent implements OnInit {
     const clientId = this.fixedDepositsAccountData.clientId;
     const url: string = this.router.url;
     this.router
-      .navigateByUrl(`/clients/${clientId}/fixed-deposits-accounts`, { skipLocationChange: true })
+      .navigateByUrl(`/members/${clientId}/fixed-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts
index ff15f2d2c0..ddcfcd8f2a 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts
@@ -243,7 +243,7 @@ export class TransactionsTabComponent implements OnInit {
   reload() {
     const url: string = this.router.url;
     this.router
-      .navigateByUrl(`/clients/${this.clientId}/fixed-deposits-accounts`, { skipLocationChange: true })
+      .navigateByUrl(`/members/${this.clientId}/fixed-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/charges-tab/charges-tab.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/charges-tab/charges-tab.component.ts
index bcb78acb21..504810d41e 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/charges-tab/charges-tab.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/charges-tab/charges-tab.component.ts
@@ -259,7 +259,7 @@ export class ChargesTabComponent implements OnInit {
     const clientId = this.recurringDepositsAccountData.clientId;
     const url: string = this.router.url;
     this.router
-      .navigateByUrl(`/clients/${clientId}/recurring-deposits-accounts`, { skipLocationChange: true })
+      .navigateByUrl(`/members/${clientId}/recurring-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 }
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 89a51929fa..e27c1d6df0 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
@@ -199,7 +199,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
     const clientId = this.recurringDepositsAccountData.clientId;
     const url: string = this.router.url;
     this.router
-      .navigateByUrl(`/clients/${clientId}/recurring-deposits-accounts`, { skipLocationChange: true })
+      .navigateByUrl(`/members/${clientId}/recurring-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 
diff --git a/src/app/groups/groups-view/general-tab/general-tab.component.html b/src/app/groups/groups-view/general-tab/general-tab.component.html
index c8557fdfa5..91f6b908df 100644
--- a/src/app/groups/groups-view/general-tab/general-tab.component.html
+++ b/src/app/groups/groups-view/general-tab/general-tab.component.html
@@ -63,7 +63,7 @@ <h3>{{ 'labels.heading.Client Members' | translate }}</h3>
         <tr
           mat-row
           *matRowDef="let row; columns: clientMemberColumns"
-          [routerLink]="['/clients', row.id, 'general']"
+          [routerLink]="['/members', row.id, 'general']"
           class="select-row"
         ></tr>
       </table>
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index ed75382b6b..1d8ca49e64 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -27,7 +27,6 @@ import { startWith, map } from 'rxjs/operators';
 
 /** Custom Imports. */
 import { activities } from './activities';
-import { WarningDialogComponent } from './warning-dialog/warning-dialog.component';
 
 /** Custom Services */
 import { AuthenticationService } from '../core/authentication/authentication.service';
@@ -106,10 +105,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
     this.username = credentials.username;
     this.tenant = this.tenantIdentifier();
     this.setFilteredActivities();
-    if (!this.authenticationService.hasDialogBeenShown()) {
-      this.dialog.open(WarningDialogComponent);
-      this.authenticationService.showDialog();
-    }
   }
 
   /**
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 86c9f7b124..290a6b761d 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -19,7 +19,7 @@ import { PipesModule } from '../pipes/pipes.module';
 import { HomeComponent } from './home.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { WarningDialogComponent } from './warning-dialog/warning-dialog.component';
+
 import { SessionTimeoutDialogComponent } from './timeout-dialog/session-timeout-dialog.component';
 
 /**
@@ -36,7 +36,6 @@ import { SessionTimeoutDialogComponent } from './timeout-dialog/session-timeout-
     TranslateModule,
     HomeComponent,
     DashboardComponent,
-    WarningDialogComponent,
     SessionTimeoutDialogComponent
   ],
   providers: []
diff --git a/src/app/home/warning-dialog/warning-dialog.component.html b/src/app/home/warning-dialog/warning-dialog.component.html
deleted file mode 100644
index 87001bc3b9..0000000000
--- a/src/app/home/warning-dialog/warning-dialog.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<h1 mat-dialog-title>{{ 'labels.text.' + title | translate }}</h1>
-<mat-dialog-content>{{ 'labels.text.Warning message' | translate }}</mat-dialog-content>
-<mat-dialog-actions>
-  <button mat-raised-button color="primary" mat-dialog-close>{{ 'labels.buttons.' + buttonText | translate }}</button>
-</mat-dialog-actions>
diff --git a/src/app/home/warning-dialog/warning-dialog.component.scss b/src/app/home/warning-dialog/warning-dialog.component.scss
deleted file mode 100644
index af9f4c0753..0000000000
--- a/src/app/home/warning-dialog/warning-dialog.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
diff --git a/src/app/home/warning-dialog/warning-dialog.component.ts b/src/app/home/warning-dialog/warning-dialog.component.ts
deleted file mode 100644
index 158cdaaf13..0000000000
--- a/src/app/home/warning-dialog/warning-dialog.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import {
-  MatDialogRef,
-  MatDialogTitle,
-  MatDialogContent,
-  MatDialogActions,
-  MatDialogClose
-} from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
-import { CdkScrollable } from '@angular/cdk/scrolling';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-
-@Component({
-  selector: 'mifosx-warning-dialog',
-  standalone: true,
-  templateUrl: './warning-dialog.component.html',
-  styleUrls: ['./warning-dialog.component.scss'],
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    MatDialogTitle,
-    CdkScrollable,
-    MatDialogContent,
-    MatDialogActions,
-    MatDialogClose
-  ],
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class WarningDialogComponent {
-  dialogRef = inject<MatDialogRef<WarningDialogComponent>>(MatDialogRef);
-
-  title: string;
-  content: string;
-  buttonText: string;
-
-  constructor() {
-    this.title = environment.warningDialog.title;
-    this.content = environment.warningDialog.content;
-    this.buttonText = environment.warningDialog.buttonText;
-  }
-}
diff --git a/src/app/keyboards-shortcut-config.ts b/src/app/keyboards-shortcut-config.ts
index 20cb6cd103..1c00c62ef9 100644
--- a/src/app/keyboards-shortcut-config.ts
+++ b/src/app/keyboards-shortcut-config.ts
@@ -63,12 +63,12 @@ export class KeyboardShortcutsConfiguration {
       // },
       // Create Client - ctrl + c
       {
-        title: 'Create Client',
+        title: 'Create Member',
         ctrlKey: false,
         shiftKey: false,
         altKey: true,
         key: 'c',
-        route: 'clients/create'
+        route: 'members/create'
       },
       // Create Group - ctrl + g
       {
diff --git a/src/app/loans/loans-view/loan-account-tab-base.component.ts b/src/app/loans/loans-view/loan-account-tab-base.component.ts
index fd46e974e1..3865fbe0a0 100644
--- a/src/app/loans/loans-view/loan-account-tab-base.component.ts
+++ b/src/app/loans/loans-view/loan-account-tab-base.component.ts
@@ -21,7 +21,7 @@ export abstract class LoanAccountTabBaseComponent {
   protected reload() {
     const url: string = this.router.url.split('?')[0];
     this.router
-      .navigateByUrl(`/clients`, { skipLocationChange: true })
+      .navigateByUrl(`/members`, { skipLocationChange: true })
       .then(() =>
         this.router.navigate([url], { queryParams: { productType: this.loanProductService.productType.value } })
       );
diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
index 6bf2c7fda2..b952316fb3 100644
--- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
+++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
@@ -374,7 +374,7 @@ export class ViewTransactionComponent extends LoanAccountActionsBaseComponent im
   }
 
   loanTransactionRelatedLink(transactionId: number) {
-    return `/#/clients/${this.clientId}/loans-accounts/${this.loanId}/transactions/${transactionId}`;
+    return `/#/members/${this.clientId}/loans-accounts/${this.loanId}/transactions/${transactionId}`;
   }
 
   loanTransactionColor(): string {
diff --git a/src/app/login/login-form/login-form.component.html b/src/app/login/login-form/login-form.component.html
index a8718705ab..ade271a7f8 100644
--- a/src/app/login/login-form/login-form.component.html
+++ b/src/app/login/login-form/login-form.component.html
@@ -85,7 +85,7 @@
         variant="filled"
         type="submit"
         class="login-submit-button"
-        [disabled]="!loginForm.valid || loading"
+        [disabled]="loading"
         [fullWidth]="true"
         [label]="(loading ? 'labels.buttons.Signing in...' : 'labels.buttons.Login') | translate"
       >
diff --git a/src/app/login/login-form/login-form.component.scss b/src/app/login/login-form/login-form.component.scss
index 1b903ffbeb..3fc3f96d68 100644
--- a/src/app/login/login-form/login-form.component.scss
+++ b/src/app/login/login-form/login-form.component.scss
@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright since 2025 Mifos Initiative
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -6,22 +6,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/**
- * Modern Material Design 3 Login Form Styles
- */
+// ===== Colors =====
+$brand-blue: #1074b9;
+$text-dark: #1e293b;
+$text-muted: #64748b;
+$input-bg: #f1f5f9;
+$input-border: #e2e8f0;
 
 // ===== Main Form Container =====
-.modern-login-form {
-  width: 100%;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
 #login-form {
   display: flex;
   flex-direction: column;
-  gap: 0.5rem;
+  gap: 0.75rem;
   animation: slide-in 0.4s ease-out;
   flex: 1;
 }
@@ -38,46 +34,35 @@
       width: 100%;
       margin-bottom: 0;
 
-      // Apply same styling as login fields
       .mat-mdc-text-field-wrapper {
-        border-radius: 12px 12px 0 0;
+        background: $input-bg;
+        border-radius: 10px;
+        border: 1px solid $input-border;
       }
 
       .mat-mdc-form-field-focus-overlay {
-        border-radius: 12px 12px 0 0;
-        background-color: var(--md-sys-color-on-surface, #1a1c1e);
-        opacity: 0.04;
-      }
-
-      &.mat-focused {
-        .mat-mdc-form-field-focus-overlay {
-          opacity: 0.12;
-        }
+        display: none;
       }
 
+      .mdc-line-ripple::before,
       .mdc-line-ripple::after {
-        border-bottom-color: var(--md-sys-color-primary, #1074b9);
+        border-bottom: none;
       }
 
       .mat-mdc-select {
-        font-size: 1rem;
+        font-size: 0.95rem;
         font-weight: 400;
-        color: var(--md-sys-color-on-surface, #1a1c1e);
+        color: $text-dark;
       }
 
       .mat-mdc-floating-label {
-        font-size: 1rem;
-        color: var(--md-sys-color-on-surface-variant, #44474e);
+        font-size: 0.95rem;
+        color: $text-muted;
       }
 
       .mat-mdc-form-field-icon-prefix {
         padding: 0 0.75rem 0 0.5rem;
-        color: var(--md-sys-color-on-surface-variant, #44474e);
-
-        fa-icon {
-          font-size: 1.25rem;
-          opacity: 0.7;
-        }
+        color: $text-muted;
       }
     }
 
@@ -93,93 +78,82 @@
   margin-bottom: 0;
 
   ::ng-deep {
-    // Field container
     .mat-mdc-text-field-wrapper {
-      border-radius: 12px 12px 0 0;
+      background: $input-bg !important;
+      border-radius: 10px !important;
+      border: 1px solid $input-border !important;
+      transition: border-color 0.2s ease;
     }
 
-    // Focus overlay
-    .mat-mdc-form-field-focus-overlay {
-      border-radius: 12px 12px 0 0;
-      background-color: var(--md-sys-color-on-surface, #1a1c1e);
-      opacity: 0.04;
+    &.mat-focused .mat-mdc-text-field-wrapper {
+      border-color: $brand-blue !important;
     }
 
-    // Focus state
-    &.mat-focused {
-      .mat-mdc-form-field-focus-overlay {
-        opacity: 0.12;
-      }
+    .mat-mdc-form-field-focus-overlay {
+      display: none !important;
     }
 
-    // Bottom indicator line
+    .mdc-line-ripple::before,
     .mdc-line-ripple::after {
-      border-bottom-color: var(--md-sys-color-primary, #1074b9);
+      border-bottom: none !important;
     }
 
-    // Input field
     .mat-mdc-input-element {
-      font-size: 1rem;
+      font-size: 0.95rem;
       font-weight: 400;
-      color: var(--md-sys-color-on-surface, #1a1c1e);
+      color: $text-dark;
       padding: 0.875rem 0;
       margin-left: 0;
 
       &::placeholder {
-        color: var(--md-sys-color-on-surface-variant, #44474e);
-        opacity: 0.6;
+        color: #94a3b8;
+        opacity: 1;
       }
     }
 
-    // Label
     .mat-mdc-floating-label {
-      font-size: 1rem;
-      color: var(--md-sys-color-on-surface-variant, #44474e);
+      font-size: 0.95rem;
+      color: $text-muted;
       left: 0 !important;
     }
 
-    // Prefix icon
     .mat-mdc-form-field-icon-prefix {
       padding: 0 0.75rem 0 0.5rem;
-      color: var(--md-sys-color-on-surface-variant, #44474e);
+      color: $text-muted;
 
-      fa-icon {
-        font-size: 1.25rem;
-        opacity: 0.7;
+      mifosx-m3-icon,
+      mat-icon {
+        color: $text-muted;
       }
     }
 
-    // Form field infix - align label with input
     .mat-mdc-form-field-infix {
       padding-left: 0;
     }
 
-    // Suffix button (password toggle)
     .mat-mdc-form-field-icon-suffix {
       button {
         background: transparent;
         border: none;
-        color: var(--md-sys-color-on-surface-variant, #44474e);
-        transition: all 0.2s ease;
+        color: $text-muted;
+        transition: color 0.2s ease;
+
+        &:hover {
+          color: $text-dark;
+        }
       }
     }
 
-    // Error state
     &.mat-form-field-invalid {
-      .mdc-line-ripple::after {
-        border-bottom-color: var(--md-sys-color-error, #ba1a1a);
-      }
-
-      .mat-mdc-form-field-icon-prefix fa-icon {
-        color: var(--md-sys-color-error, #ba1a1a);
+      .mat-mdc-text-field-wrapper {
+        border-color: #dc2626 !important;
       }
     }
 
-    // Error message
     .mat-mdc-form-field-error {
       font-size: 0.75rem;
       margin-top: 0.25rem;
-      color: var(--md-sys-color-error, #ba1a1a);
+      color: #dc2626;
     }
   }
 }
@@ -188,11 +162,11 @@
 .login-progress {
   height: 3px;
   border-radius: 4px;
-  margin: -0.5rem 0 0.5rem;
+  margin: -0.25rem 0 0.5rem;
 
   ::ng-deep {
     .mdc-linear-progress__bar-inner {
-      border-color: var(--md-sys-color-primary, #1074b9);
+      border-color: $brand-blue;
     }
   }
 }
@@ -200,13 +174,18 @@
 // ===== Submit Button =====
 .login-submit-button {
   min-height: 48px;
-  color: var(--md-sys-color-on-surface-variant, #44474e);
-  margin-top: 0.5rem;
+  color: #fff;
+  margin-top: 0.75rem;
 
   ::ng-deep md-filled-button {
-    font-size: 1rem;
-    font-weight: 500;
-    letter-spacing: 0.01em;
+    font-size: 0.95rem;
+    font-weight: 600;
+    letter-spacing: 0.02em;
+
+    --md-filled-button-container-color: #{$brand-blue};
+    --md-filled-button-label-text-color: #fff;
+
+    border-radius: 10px;
   }
 
   .button-spinner {
@@ -233,7 +212,7 @@
 
 .oidc-description {
   font-size: 0.95rem;
-  color: var(--md-sys-color-on-surface-variant, #44474e);
+  color: $text-muted;
   margin: 0;
   line-height: 1.5;
 }
@@ -250,19 +229,19 @@
   align-items: center;
   gap: 1rem;
   padding: 2rem;
-  background: var(--md-sys-color-primary-container, #d1e4ff);
-  border-radius: 16px;
+  background: #dbeafe;
+  border-radius: 12px;
 
   .success-icon {
     font-size: 3rem;
-    color: var(--md-sys-color-primary, #1074b9);
+    color: $brand-blue;
   }
 
   h3 {
     margin: 0;
     font-size: 1.25rem;
     font-weight: 600;
-    color: var(--md-sys-color-on-primary-container, #001d36);
+    color: $text-dark;
   }
 }
 
@@ -279,9 +258,9 @@
 
 .protected-data {
   padding: 1rem;
-  background: var(--md-sys-color-surface-container, #f3f3f3);
+  background: $input-bg;
   border-radius: 12px;
-  border: 1px solid var(--md-sys-color-outline-variant, #c4c6d0);
+  border: 1px solid $input-border;
   max-height: 300px;
   overflow: auto;
 
@@ -289,28 +268,32 @@
     margin: 0;
     font-size: 0.875rem;
     font-family: 'Courier New', monospace;
-    color: var(--md-sys-color-on-surface, #1a1c1e);
+    color: $text-dark;
     white-space: pre-wrap;
     overflow-wrap: break-word;
   }
 }
 
-// ===== Dark Theme Support =====
+// ===== Dark Theme =====
 :host-context(.dark-theme) {
-  // Tenant selector dark theme
   ::ng-deep .tenant-section {
     mifosx-tenant-selector {
       #tenant-selector {
+        .mat-mdc-text-field-wrapper {
+          background: #2a2a2a;
+          border-color: #444;
+        }
+
         .mat-mdc-select {
-          color: var(--md-sys-color-on-surface, #e2e2e5);
+          color: #e2e2e5;
         }
 
         .mat-mdc-floating-label {
-          color: var(--md-sys-color-on-surface-variant, #c4c6d0);
+          color: #c4c6d0;
         }
 
         .mat-mdc-form-field-icon-prefix {
-          color: var(--md-sys-color-on-surface-variant, #c4c6d0);
+          color: #c4c6d0;
         }
       }
     }
@@ -318,91 +301,87 @@
 
   .login-field {
     ::ng-deep {
+      .mat-mdc-text-field-wrapper {
+        background: #2a2a2a !important;
+        border-color: #444 !important;
+      }
+
       .mat-mdc-input-element {
-        color: var(--md-sys-color-on-surface, #e2e2e5);
+        color: #e2e2e5;
 
         &::placeholder {
-          color: var(--md-sys-color-on-surface-variant, #c4c6d0);
+          color: #888;
         }
       }
 
       .mat-mdc-floating-label {
-        color: var(--md-sys-color-on-surface-variant, #c4c6d0);
+        color: #c4c6d0;
       }
 
       .mat-mdc-form-field-icon-prefix {
-        color: var(--md-sys-color-on-surface-variant, #c4c6d0);
+        color: #c4c6d0;
+
+        mifosx-m3-icon,
+        mat-icon {
+          color: #c4c6d0;
+        }
       }
 
       .mat-mdc-form-field-icon-suffix button {
-        color: var(--md-sys-color-on-surface-variant, #c4c6d0);
+        color: #c4c6d0;
       }
     }
   }
 
-  .oidc-description {
-    color: var(--md-sys-color-on-surface-variant, #c4c6d0);
-  }
-
   .welcome-message {
-    background: var(--md-sys-color-primary-container, #003a6b);
+    background: #003a6b;
 
     .success-icon {
-      color: var(--md-sys-color-primary, #5ba2ec);
+      color: #5ba2ec;
     }
 
     h3 {
-      color: var(--md-sys-color-on-primary-container, #d1e4ff);
+      color: #d1e4ff;
     }
   }
 
   .protected-data {
-    background: var(--md-sys-color-surface-container, #2c2f36);
-    border-color: var(--md-sys-color-outline-variant, #44474e);
+    background: #2c2f36;
+    border-color: #44474e;
 
     pre {
-      color: var(--md-sys-color-on-surface, #e2e2e5);
+      color: #e2e2e5;
     }
   }
 }
 
-// ===== Responsive Design =====
+// ===== Responsive =====
 /* stylelint-disable-next-line media-feature-range-notation -- Safari compatibility */
 @media (max-width: 768px) {
   #login-form {
-    gap: 0.25rem;
-  }
-
-  .login-field {
-    margin-bottom: 0;
+    gap: 0.5rem;
   }
 
   .login-submit-button {
     margin-top: 0.5rem;
   }
-
-  .login-actions {
-    margin-top: 0.5rem;
-  }
 }
 
 /* stylelint-disable-next-line media-feature-range-notation -- Safari compatibility */
 @media (max-width: 480px) {
   #login-form {
-    gap: 0.15rem;
+    gap: 0.35rem;
   }
 
   .login-field {
-    margin-bottom: 0;
-
     ::ng-deep {
       .mat-mdc-input-element {
-        font-size: 0.95rem;
+        font-size: 0.9rem;
         padding: 0.65rem 0.5rem;
       }
 
       .mat-mdc-floating-label {
-        font-size: 0.9rem;
+        font-size: 0.85rem;
       }
 
       .mat-mdc-form-field-icon-prefix {
diff --git a/src/app/login/login-form/login-form.component.ts b/src/app/login/login-form/login-form.component.ts
index 69349c6ed0..78ab14eaad 100644
--- a/src/app/login/login-form/login-form.component.ts
+++ b/src/app/login/login-form/login-form.component.ts
@@ -72,6 +72,10 @@ export class LoginFormComponent implements OnInit {
    * Authenticates the user if the credentials are valid.
    */
   login() {
+    this.loginForm.markAllAsTouched();
+    if (this.loginForm.invalid) {
+      return;
+    }
     this.loading = true;
     this.loginForm.disable();
     this.authenticationService
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index c056c71655..b9bd9cf99d 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -5,78 +5,54 @@
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
-<!-- Modern Material Design 3 Login Layout -->
 <div class="login-wrapper">
-  <!-- Left Panel - Hero Section (Hidden on tablet and mobile) -->
-  <div class="hero-panel hide-lt-lg" [class.production-mode]="productionMode">
+  <!-- Left Panel - Hero -->
+  <div class="hero-panel hide-lt-lg">
     <div class="hero-overlay"></div>
     <div class="hero-content">
-      <!-- Default Mode: Full content -->
-      @if (!productionMode) {
-        <div class="hero-text">
-          <h1 class="hero-title">{{ 'APP_NAME' | translate }}</h1>
-          <p class="hero-subtitle">
-            {{ 'labels.text.A' | translate }}
-            <span class="hero-highlight">{{ 'labels.text.global community' | translate }}</span>
-            {{ 'labels.text.elimination of poverty' | translate }}
-          </p>
-          <div class="hero-features">
-            <div class="feature-item">
-              <fa-icon icon="shield-alt" class="feature-icon"></fa-icon>
-              <span class="feature-text">{{ 'labels.heading.Secure & Reliable' | translate }}</span>
-            </div>
-            <div class="feature-item">
-              <fa-icon icon="users" class="feature-icon"></fa-icon>
-              <span class="feature-text">{{ 'labels.heading.Community Driven' | translate }}</span>
-            </div>
-            <div class="feature-item">
-              <fa-icon icon="globe" class="feature-icon"></fa-icon>
-              <span class="feature-text">{{ 'labels.heading.Global Impact' | translate }}</span>
-            </div>
+      <h1 class="hero-title">Welcome to CoIMS</h1>
+      <p class="hero-subtitle">
+        Your trusted cooperative banking platform for savings, loans, share management, and seamless financial services.
+      </p>
+
+      <!-- Features -->
+      <div class="hero-features">
+        <div class="feature-item">
+          <div class="feature-check">
+            <span class="check-mark">&#10003;</span>
+          </div>
+          <div class="feature-text">
+            <strong>Savings &amp; Deposits</strong>
+            <span>Manage member savings, fixed deposits, and recurring deposits</span>
+          </div>
+        </div>
+        <div class="feature-item">
+          <div class="feature-check">
+            <span class="check-mark">&#10003;</span>
           </div>
-          <div class="hero-links">
-            <a [href]="'mifosHome' | documentationLink" target="_blank" rel="noopener noreferrer" class="hero-link">
-              {{ 'labels.text.Mifos Initiative' | translate }}
-              <fa-icon icon="external-link-alt" size="sm"></fa-icon>
-            </a>
-            <a
-              [href]="'mifosVolunteer' | documentationLink"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="hero-link"
-            >
-              {{ 'labels.text.Get involved' | translate }}
-              <fa-icon icon="external-link-alt" size="sm"></fa-icon>
-            </a>
+          <div class="feature-text">
+            <strong>Loan Management</strong>
+            <span>Process loan applications, disbursements, and repayments</span>
           </div>
         </div>
-      }
-      <!-- Production Mode: Minimal branding at bottom -->
-      @if (productionMode) {
-        <div class="hero-branding-bottom">
-          <h1 class="hero-title-minimal">{{ 'APP_NAME' | translate }}</h1>
+        <div class="feature-item">
+          <div class="feature-check">
+            <span class="check-mark">&#10003;</span>
+          </div>
+          <div class="feature-text">
+            <strong>Share Capital</strong>
+            <span>Track member shares, dividends, and equity contributions</span>
+          </div>
         </div>
-      }
+      </div>
     </div>
   </div>
 
   <!-- Right Panel - Login Form -->
   <div class="login-panel">
-    <!-- Header Controls -->
-    <div class="login-header">
-      @if (allowServerSwitch()) {
-        <mifosx-server-selector class="header-control" appearance="outline" [showLabel]="false">
-        </mifosx-server-selector>
-      }
-      <mifosx-theme-toggle class="header-control theme-toggle"></mifosx-theme-toggle>
-      <mifosx-language-selector class="header-control" appearance="outline" [showLabel]="false">
-      </mifosx-language-selector>
-    </div>
-
-    <!-- Main Login Card -->
     <div class="login-card-container">
       <div class="login-card">
-        <!-- Logo Section -->
+        <!-- Logo -->
         <div class="logo-section">
           @if (!themeDarkEnabled) {
             <img [src]="logoPath" (error)="onLogoError()" alt="{{ 'APP_NAME' | translate }} Logo" class="logo-image" />
@@ -89,140 +65,34 @@ <h1 class="hero-title-minimal">{{ 'APP_NAME' | translate }}</h1>
             />
           }
         </div>
+        <p class="card-subtitle">Enter your credentials to access your account</p>
 
-        <!-- Form Section -->
-        <div class="form-section">
-          <!-- Tenant Selector -->
-          @if (showTenantSelector) {
-            <div class="tenant-section">
-              <mifosx-tenant-selector></mifosx-tenant-selector>
-            </div>
-          }
-
-          <!-- Login Forms -->
-          @if (!resetPassword && !twoFactorAuthenticationRequired) {
-            <mifosx-login-form></mifosx-login-form>
-          }
-
-          @if (resetPassword) {
-            <mifosx-reset-password></mifosx-reset-password>
-          }
-
-          @if (twoFactorAuthenticationRequired) {
-            <mifosx-two-factor-authentication></mifosx-two-factor-authentication>
-          }
-        </div>
-
-        <!-- Version Info Section -->
-        <div class="login-version-info" *ngIf="displayBackendInfo">
-          <div class="version-info-container">
-            <div class="version-item">
-              <span class="version-label">{{ 'labels.version.Tenant' | translate }}</span>
-              <span class="version-value">{{ tenantDisplayName }}</span>
-            </div>
-            <div class="version-item">
-              <span class="version-label">{{ 'labels.version.Mifos WebApp' | translate }}</span>
-              <span class="version-value">{{ versions?.mifos }}</span>
-            </div>
-            <div class="version-item">
-              <span class="version-label">{{ 'labels.version.Apache Fineract' | translate }}</span>
-              <span class="version-value">{{ versions?.fineract?.version }}</span>
-            </div>
-            <div class="version-item">
-              <span class="version-label">{{ 'labels.version.Server' | translate }}</span>
-              <span class="version-value">{{ server }}</span>
-            </div>
+        <!-- Tenant Selector -->
+        @if (showTenantSelector) {
+          <div class="tenant-section">
+            <mifosx-tenant-selector></mifosx-tenant-selector>
           </div>
-        </div>
+        }
 
-        <!-- Resources Links (hidden in production mode) -->
-        @if (!productionMode) {
-          <div class="resources-section">
-            <div class="resources-branding">
-              <span class="branding-text"
-                >{{ 'labels.text.Powered by' | translate }}
-                <a href="https://mifos.org" target="_blank" rel="noopener noreferrer">{{
-                  'labels.text.Mifos Initiative' | translate
-                }}</a></span
-              >
-            </div>
-            <div class="resources-links">
-              <button mat-button [matMenuTriggerFor]="resourcesMenu" class="resource-button">
-                <fa-icon icon="book" size="sm"></fa-icon>
-                {{ 'labels.links.Resources' | translate }}
-              </button>
-              <button mat-button [matMenuTriggerFor]="communityMenu" class="resource-button">
-                <fa-icon icon="users" size="sm"></fa-icon>
-                {{ 'labels.links.Community' | translate }}
-              </button>
-              <button mat-button [matMenuTriggerFor]="contributeMenu" class="resource-button">
-                <fa-icon icon="heart" size="sm"></fa-icon>
-                {{ 'labels.links.Contribute' | translate }}
-              </button>
-            </div>
-          </div>
+        <!-- Login Form -->
+        @if (!resetPassword && !twoFactorAuthenticationRequired) {
+          <mifosx-login-form></mifosx-login-form>
         }
-      </div>
 
-      <!-- Footer -->
-      <div class="login-footer">
-        <button
-          mat-icon-button
-          (click)="reloadSettings()"
-          class="reload-button"
-          title="Reload Settings"
-          matTooltip="Reload Settings"
-          attr.aria-label="Reload Settings"
-        >
-          <mifosx-m3-icon name="refresh"></mifosx-m3-icon>
-        </button>
+        @if (resetPassword) {
+          <mifosx-reset-password></mifosx-reset-password>
+        }
+
+        @if (twoFactorAuthenticationRequired) {
+          <mifosx-two-factor-authentication></mifosx-two-factor-authentication>
+        }
       </div>
     </div>
+
+    <!-- Footer -->
+    <p class="login-footer">
+      &copy; 2026 CoIMS. All rights reserved. Developed by
+      <a href="https://dibugsoft.com/" target="_blank" rel="noopener noreferrer">Debugsoft</a>
+    </p>
   </div>
 </div>
-
-<!-- Resource Menus -->
-<mat-menu #resourcesMenu="matMenu" class="modern-menu">
-  <a [href]="'userManual' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="book-open" class="menu-icon"></fa-icon>
-    {{ 'labels.links.User Manual' | translate }}
-  </a>
-  <a [href]="'fineractFunctionalSpecs' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="file-alt" class="menu-icon"></fa-icon>
-    {{ 'labels.links.Functional Specifications' | translate }}
-  </a>
-  <a [href]="'fineractContributorZone' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="code" class="menu-icon"></fa-icon>
-    {{ 'labels.links.Developer Zone' | translate }}
-  </a>
-</mat-menu>
-
-<mat-menu #communityMenu="matMenu" class="modern-menu">
-  <a [href]="'mifosUserGroup' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="users" class="menu-icon"></fa-icon>
-    {{ 'labels.links.User Group' | translate }}
-  </a>
-  <a [href]="'mifosDeveloperGroup' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="laptop-code" class="menu-icon"></fa-icon>
-    {{ 'labels.links.Developer Group' | translate }}
-  </a>
-  <a [href]="'mifosIrc' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="comments" class="menu-icon"></fa-icon>
-    {{ 'labels.links.IRC' | translate }}
-  </a>
-</mat-menu>
-
-<mat-menu #contributeMenu="matMenu" class="modern-menu">
-  <a [href]="'keyDesignPrinciples' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="lightbulb" class="menu-icon"></fa-icon>
-    {{ 'labels.links.Key Design Principles' | translate }}
-  </a>
-  <a [href]="'sourceforgeMifos' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="code-branch" class="menu-icon"></fa-icon>
-    {{ 'labels.links.Working with Code' | translate }}
-  </a>
-  <a [href]="'mifosDonate' | documentationLink" target="_blank" rel="noopener noreferrer" mat-menu-item>
-    <fa-icon icon="hand-holding-heart" class="menu-icon"></fa-icon>
-    {{ 'labels.links.Donate' | translate }}
-  </a>
-</mat-menu>
diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss
index 4721bd5e4f..6b28475e1a 100644
--- a/src/app/login/login.component.scss
+++ b/src/app/login/login.component.scss
@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright since 2025 Mifos Initiative
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -6,149 +6,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-// ===
-/// ===== Version Info Section - Modern Card Style =====
-.login-version-info {
-  margin-bottom: 1rem;
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.version-info-container {
-  width: 100%;
-  background: var(--md-sys-color-surface-container, #f3f3f6);
-  border-radius: 12px;
-  padding: 0.75rem 1rem;
-  border: 1px solid var(--md-sys-color-outline-variant, #c4c6d0);
-}
-
-.version-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0.4rem 0;
-  border-bottom: 1px solid var(--md-sys-color-outline-variant, #e0e0e0);
-
-  &:last-child {
-    border-bottom: none;
-  }
-}
-
-.version-label {
-  font-weight: 500;
-  font-size: 0.75rem;
-  color: var(--md-sys-color-on-surface-variant, #44474e);
-  flex-shrink: 0;
-}
-
-.version-value {
-  font-weight: 400;
-  font-size: 0.75rem;
-  color: var(--md-sys-color-on-surface, #1a1c1e);
-  text-align: right;
-  word-break: break-word;
-  max-width: 60%;
-}
-
-// ===== Resources Branding =====
-.resources-branding {
-  text-align: center;
-  margin-bottom: 0.75rem;
-
-  .branding-text {
-    font-size: 0.8rem;
-    color: var(--md-sys-color-on-surface-variant, #44474e);
-    font-weight: 400;
-
-    a {
-      color: var(--md-sys-color-primary, #1074b9);
-      text-decoration: none;
-      font-weight: 500;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}
-
-// ===== Dark Mode Support =====
-:host-context(.dark-theme),
-:host-context([data-theme='dark']) {
-  .version-info-container {
-    background: var(--md-sys-color-surface-container-low, #2a2a2a);
-    border-color: var(--md-sys-color-outline-variant, #3d3d3d);
-  }
-
-  .version-item {
-    border-bottom-color: var(--md-sys-color-outline-variant, #3d3d3d);
-  }
-
-  .version-label {
-    color: var(--md-sys-color-on-surface-variant, #c4c6cf);
-  }
-
-  .version-value {
-    color: var(--md-sys-color-on-surface, #e2e2e5);
-  }
-
-  .resources-branding {
-    .branding-text {
-      color: var(--md-sys-color-on-surface-variant, #c4c6cf);
-
-      a {
-        color: var(--md-sys-color-primary, #a8c8ff);
-      }
-    }
-  }
-
-  .resource-button {
-    color: var(--md-sys-color-primary, #a8c8ff);
-
-    &:hover {
-      background: rgb(168 200 255 / 12%);
-    }
-  }
-
-  .login-card {
-    border: 1px solid var(--md-sys-color-outline-variant, #3d3d3d);
-  }
-
-  .login-header {
-    ::ng-deep mifosx-theme-toggle button,
-    ::ng-deep mifosx-server-selector,
-    ::ng-deep mifosx-language-selector {
-      color: var(--md-sys-color-on-surface, #e2e2e5);
-    }
-  }
-
-  .logo-section {
-    border-bottom-color: var(--md-sys-color-outline-variant, #3d3d3d);
-  }
-}
-
-// Responsive for version info
-/* stylelint-disable-next-line media-feature-range-notation -- Safari compatibility */
-@media (max-width: 768px) {
-  .version-info-container {
-    padding: 0.5rem 0.75rem;
-  }
-
-  .version-item {
-    padding: 0.35rem 0;
-  }
-
-  .version-label,
-  .version-value {
-    font-size: 0.7rem;
-  }
-}
-
-/**
- * Modern Material Design 3 Login Component Styles
- */
+// ===== Colors =====
+$brand-blue: #1074b9;
+$brand-blue-dark: #0a5a8f;
+$text-dark: #1e293b;
+$text-muted: #64748b;
+$input-bg: #f1f5f9;
+$input-border: #e2e8f0;
 
 // ===== Main Wrapper =====
 .login-wrapper {
@@ -156,215 +20,107 @@
   min-height: 100vh;
   height: 100%;
   width: 100%;
-  background: var(--md-sys-color-background, #fafafa);
   overflow-x: hidden;
 }
 
 // ===== Hero Panel (Left Side) =====
 .hero-panel {
-  flex: 0 0 70%;
+  flex: 0 0 50%;
   position: relative;
-  background: url('../../assets/images/cover_image_resized.webp') no-repeat center center;
-  background-size: cover;
   overflow: hidden;
+  background:
+    linear-gradient(150deg, rgb(8 60 120 / 90%) 0%, rgb(14 90 160 / 85%) 40%, rgb(16 116 185 / 80%) 100%),
+    url('/assets/images/hero.jpg') center / cover no-repeat;
+}
 
-  // Overlay removed for clean image view
-  .hero-overlay {
-    position: absolute;
-    /* stylelint-disable declaration-block-no-redundant-longhand-properties -- Safari compatibility */
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    /* stylelint-enable declaration-block-no-redundant-longhand-properties */
-    background: transparent;
-    z-index: 1;
-  }
-
-  .hero-content {
-    position: relative;
-    z-index: 2;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 4rem;
-  }
-
-  .hero-text {
-    max-width: 550px;
-    color: #fff;
-    animation: fade-in-up 0.8s ease-out;
-    flex: 0 1 auto;
-    // Minimal backdrop - more image visibility
-    background: rgb(0 0 0 / 35%);
-    border-radius: 20px;
-    padding: 2rem;
-    border: 1px solid rgb(255 255 255 / 15%);
-    box-shadow: 0 4px 24px rgb(0 0 0 / 20%);
-  }
-
-  // Footer in hero panel
-  mifosx-footer {
-    width: 100%;
-    margin-top: auto;
-    padding-top: 2rem;
-
-    ::ng-deep .footer-compact {
-      color: rgb(255 255 255 / 90%);
-      align-items: center;
-      text-align: center;
-
-      .footer-info {
-        justify-content: center;
-
-        .info-label {
-          color: rgb(255 255 255 / 80%);
-          font-weight: 500;
-        }
-
-        .info-value {
-          color: rgb(255 255 255 / 95%);
-          font-weight: 400;
-        }
-
-        .info-separator {
-          color: rgb(255 255 255 / 50%);
-        }
-      }
+.hero-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-image:
+    radial-gradient(circle at 20% 80%, rgb(255 255 255 / 5%) 0%, transparent 50%),
+    radial-gradient(circle at 80% 20%, rgb(255 255 255 / 4%) 0%, transparent 40%);
+  z-index: 0;
+}
 
-      .footer-copyright {
-        color: rgb(255 255 255 / 75%);
-        font-size: 0.875rem;
-        text-align: center;
-      }
-    }
-  }
+// ===== Hero Content =====
+.hero-content {
+  position: relative;
+  z-index: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding: 3.5rem;
+}
 
-  .hero-title {
-    font-size: 3.5rem;
-    font-weight: 700;
-    margin: 0 0 1.5rem;
-    line-height: 1.2;
-    letter-spacing: -0.02em;
-    color: #fff;
-    text-shadow:
-      0 2px 4px rgb(0 0 0 / 30%),
-      0 4px 12px rgb(0 0 0 / 15%);
-  }
+.hero-title {
+  font-size: 2.5rem;
+  font-weight: 700;
+  color: #fff;
+  margin: 0 0 1rem;
+  line-height: 1.15;
+}
 
-  .hero-subtitle {
-    font-size: 1.25rem;
-    line-height: 1.6;
-    margin: 0 0 2rem;
-    font-weight: 400;
-    color: rgb(255 255 255 / 95%);
-    text-shadow: 0 1px 3px rgb(0 0 0 / 40%);
-  }
+.hero-subtitle {
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.7;
+  color: rgb(255 255 255 / 65%);
+  margin: 0 0 3rem;
+  max-width: 440px;
+}
 
-  .hero-highlight {
-    font-weight: 600;
-    color: #b4d575;
-    text-shadow: 0 1px 2px rgb(0 0 0 / 30%);
-  }
+// ===== Feature Items =====
+.hero-features {
+  display: flex;
+  flex-direction: column;
+  gap: 1.25rem;
+  margin-top: auto;
+}
 
-  .hero-features {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-    margin-bottom: 1.5rem;
-  }
+.feature-item {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.875rem;
+}
 
-  .feature-item {
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-    padding: 0.5rem 0;
-    background: transparent;
-    border-radius: 8px;
-    transition: all 0.3s ease;
+.feature-check {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  background: rgb(74 222 128 / 20%);
+  flex-shrink: 0;
+  margin-top: 2px;
+}
 
-    &:hover {
-      transform: translateX(4px);
-    }
-  }
+.check-mark {
+  font-size: 0.8rem;
+  font-weight: 700;
+  color: #4ade80;
+  line-height: 1;
+}
 
-  .feature-icon {
-    font-size: 1.25rem;
-    color: #b4d575;
-    filter: drop-shadow(0 1px 2px rgb(0 0 0 / 30%));
-  }
+.feature-text {
+  display: flex;
+  flex-direction: column;
+  gap: 0.15rem;
 
-  .feature-text {
+  strong {
     font-size: 0.95rem;
-    font-weight: 500;
-    color: rgb(255 255 255 / 95%);
-    text-shadow: 0 1px 2px rgb(0 0 0 / 30%);
-  }
-
-  .hero-links {
-    display: flex;
-    gap: 1rem;
-    flex-wrap: wrap;
-    margin-top: 0.5rem;
-  }
-
-  .hero-link {
+    font-weight: 600;
     color: #fff;
-    text-decoration: none;
-    font-weight: 500;
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    padding: 0.75rem 1.5rem;
-    border: 1px solid rgb(255 255 255 / 30%);
-    border-radius: 24px;
-    background: rgb(255 255 255 / 10%);
-    /* stylelint-disable-next-line property-no-vendor-prefix -- Safari compatibility */
-    -webkit-backdrop-filter: blur(4px);
-    backdrop-filter: blur(4px);
-    transition: all 0.3s ease;
-    text-shadow: 0 1px 2px rgb(0 0 0 / 20%);
-    box-shadow: 0 2px 8px rgb(0 0 0 / 10%);
-
-    &:hover {
-      background: rgb(255 255 255 / 20%);
-      border-color: rgb(255 255 255 / 50%);
-      transform: translateY(-2px);
-      box-shadow: 0 4px 16px rgb(0 0 0 / 15%);
-    }
-
-    fa-icon {
-      opacity: 0.85;
-    }
   }
 
-  // ===== Production Mode Styles =====
-  &.production-mode {
-    .hero-content {
-      justify-content: flex-end;
-      padding-bottom: 3rem;
-    }
-  }
-
-  .hero-branding-bottom {
-    animation: fade-in-up 0.8s ease-out;
-  }
-
-  .hero-title-minimal {
-    font-size: 2.5rem;
-    font-weight: 700;
-    color: #fff;
-    text-shadow:
-      0 2px 8px rgb(0 0 0 / 40%),
-      0 4px 16px rgb(0 0 0 / 20%);
-    letter-spacing: -0.01em;
-    margin: 0;
-    padding: 1.5rem 2rem;
-    background: rgb(0 0 0 / 30%);
-    border-radius: 16px;
-    border: 1px solid rgb(255 255 255 / 15%);
+  span {
+    font-size: 0.825rem;
+    color: rgb(255 255 255 / 55%);
+    line-height: 1.4;
   }
 }
 
@@ -373,197 +129,46 @@
   flex: 1;
   display: flex;
   flex-direction: column;
-  background: var(--md-sys-color-surface, #fff);
+  background: #fff;
   position: relative;
-  min-height: -webkit-fill-available; // Safari fix: use available height
   min-height: 100vh;
   overflow: hidden auto;
 }
 
-.login-header {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.75rem 1rem;
-  background: transparent;
-  flex-shrink: 0; // Safari fix: prevent header from growing
-  max-height: 76px; // Safari fix: constrain header height
-  flex-wrap: nowrap;
-  overflow: hidden;
-
-  .header-control {
-    opacity: 0.8;
-    transition: opacity 0.2s ease;
-
-    &:hover {
-      opacity: 1;
-    }
-  }
-
-  .theme-toggle {
-    flex-shrink: 0; // Prevent toggle from growing
-  }
-
-  // Theme Toggle Button Styles
-  ::ng-deep mifosx-theme-toggle {
-    button {
-      color: var(--md-sys-color-on-surface, #1a1c1e);
-      transition: all 0.3s ease;
-
-      &:hover {
-        background: #1074b914;
-        color: var(--md-sys-color-primary, #1074b9);
-      }
-
-      mat-icon {
-        font-size: 24px;
-        width: 24px;
-        height: 24px;
-      }
-    }
-  }
-
-  // Language Selector Outlined Styles
-  ::ng-deep mifosx-language-selector {
-    min-width: 80px;
-    max-width: 100px;
-    flex-shrink: 0; // Safari fix
-
-    #language-selector.outlined-variant {
-      width: 100%;
-      margin: 0;
-      max-height: 56px; // Safari fix: constrain height
-
-      // Compact outlined field for header
-      .mat-mdc-form-field-flex {
-        height: 44px;
-        max-height: 44px; // Safari fix
-      }
-
-      .mat-mdc-form-field-infix {
-        padding: 10px 0;
-        min-height: 44px;
-        max-height: 44px; // Safari fix
-      }
-
-      // Rounded corners for Material Design 3
-      .mdc-notched-outline {
-        .mdc-notched-outline__leading {
-          border-radius: 12px 0 0 12px;
-          width: 12px;
-        }
-
-        .mdc-notched-outline__trailing {
-          border-radius: 0 12px 12px 0;
-        }
-      }
-    }
-  }
-
-  // Server Selector Outlined Styles
-  ::ng-deep mifosx-server-selector {
-    flex: 1;
-    min-width: 0;
-    max-width: 250px;
-
-    #server-selector.outlined-variant {
-      width: 100%;
-      margin: 0;
-      max-height: 56px; // Safari fix: constrain height
-
-      // Compact outlined field for header
-      .mat-mdc-form-field-flex {
-        height: 44px;
-        max-height: 44px; // Safari fix
-      }
-
-      .mat-mdc-form-field-infix {
-        padding: 10px 0;
-        min-height: 44px;
-        max-height: 44px; // Safari fix
-      }
-
-      // Rounded corners for Material Design 3
-      .mdc-notched-outline {
-        .mdc-notched-outline__leading {
-          border-radius: 12px 0 0 12px;
-          width: 12px;
-        }
-
-        .mdc-notched-outline__trailing {
-          border-radius: 0 12px 12px 0;
-        }
-      }
-    }
-  }
-}
-
-// ===== Login Card Container =====
+// ===== Login Card =====
 .login-card-container {
-  flex: 1 1 auto;
+  flex: 1;
   display: flex;
-  flex-direction: column;
   align-items: center;
-  justify-content: flex-start; // Safari fix: avoid center calculation issues
-  padding: 0 1rem 1rem;
-  min-height: 0; // Safari fix: allows flex item to shrink below content size
-  animation: fade-in 0.6s ease-out;
+  justify-content: center;
+  padding: 2rem 3rem;
 }
 
 .login-card {
   width: 100%;
-  max-width: 480px;
-  background: var(--md-sys-color-surface-container-low, #fff);
-  border-radius: 28px;
-  padding: 1.5rem;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  display: flex;
-  flex-direction: column;
-  margin-top: auto; // Safari fix: push card to center using margin
-  margin-bottom: auto;
-
-  &:hover {
-    box-shadow:
-      0 2px 4px #00000014,
-      0 4px 12px #0000000f,
-      0 12px 32px #0000001f;
-  }
+  max-width: 440px;
 }
 
-// ===== Logo Section =====
 .logo-section {
-  text-align: center;
-  margin-bottom: 0.75rem;
-  padding-bottom: 0.75rem;
-  border-bottom: 1px solid var(--md-sys-color-outline-variant, #e8eaed);
-  flex-shrink: 0;
-  animation: fade-in 0.5s ease-out 0.1s both;
+  margin-bottom: 1.25rem;
 }
 
 .logo-image {
-  height: 130px;
+  height: 64px;
   width: auto;
-  margin: 8px 24px;
-  opacity: 0.95;
-  transition: opacity 0.3s ease;
-
-  &:hover {
-    opacity: 1;
-  }
+  display: block;
 }
 
-// ===== Form Section =====
-.form-section {
-  margin-bottom: 1rem;
-  flex: 0 1 auto;
-  display: flex;
-  flex-direction: column;
-  animation: fade-in-up 0.6s ease-out 0.3s both;
+.card-subtitle {
+  font-size: 0.9rem;
+  color: $text-muted;
+  margin: 0 0 2rem;
+  line-height: 1.5;
 }
 
+// ===== Tenant Section =====
 .tenant-section {
   margin-bottom: 1rem;
-  flex-shrink: 0;
   width: 100%;
 
   ::ng-deep mifosx-tenant-selector {
@@ -580,117 +185,192 @@
   }
 }
 
-// ===== Resources Section =====
-.resources-section {
-  margin-top: auto;
-  padding-top: 1rem;
-  flex-shrink: 0;
-  animation: fade-in-up 0.6s ease-out 0.4s both;
-}
+// ===== Override form field styles for clean rounded inputs =====
+::ng-deep {
+  .login-card {
+    // Field container - rounded gray bg, no underline
+    .mat-mdc-text-field-wrapper {
+      background: $input-bg !important;
+      border-radius: 10px !important;
+      border: 1px solid $input-border !important;
+      transition: border-color 0.2s ease;
+    }
 
-.resources-links {
-  display: flex;
-  justify-content: center;
-  gap: 0.5rem;
-  flex-wrap: wrap;
-}
+    .mat-focused .mat-mdc-text-field-wrapper {
+      border-color: $brand-blue !important;
+    }
+
+    // Remove underline completely
+    .mdc-line-ripple::before,
+    .mdc-line-ripple::after {
+      border-bottom: none !important;
+    }
 
-.resource-button {
-  font-size: 0.875rem;
-  color: var(--md-sys-color-primary, #1074b9);
-  transition: all 0.2s ease;
+    .mat-mdc-form-field-focus-overlay {
+      display: none !important;
+    }
 
-  fa-icon {
-    margin-right: 0.4rem;
-    opacity: 0.7;
-  }
+    // Labels
+    .mat-mdc-floating-label {
+      color: $text-muted !important;
+    }
+
+    // Input text
+    .mat-mdc-input-element {
+      color: $text-dark !important;
+      caret-color: $brand-blue;
+
+      &::placeholder {
+        color: #94a3b8 !important;
+      }
+    }
+
+    // Prefix icons
+    .mat-mdc-form-field-icon-prefix {
+      color: $text-muted !important;
+
+      mifosx-m3-icon,
+      mat-icon {
+        color: $text-muted !important;
+      }
+    }
+
+    // Suffix icons
+    .mat-mdc-form-field-icon-suffix {
+      button,
+      mifosx-m3-icon,
+      mat-icon {
+        color: $text-muted !important;
+      }
+    }
 
-  &:hover {
-    background: #1074b914;
+    // Error messages
+    .mat-mdc-form-field-error {
+      color: #dc2626 !important;
+    }
 
-    fa-icon {
-      opacity: 1;
+    // Select
+    .mat-mdc-select {
+      color: $text-dark !important;
+    }
+
+    .mat-mdc-select-arrow {
+      color: $text-muted !important;
+    }
+
+    // Submit button - blue filled
+    .login-submit-button {
+      md-filled-button,
+      [mat-raised-button] {
+        --md-filled-button-container-color: #{$brand-blue} !important;
+        --md-filled-button-label-text-color: #fff !important;
+
+        background: $brand-blue !important;
+        color: #fff !important;
+        border-radius: 10px !important;
+        font-weight: 600 !important;
+        font-size: 0.95rem !important;
+      }
+    }
+
+    // Progress bar
+    .login-progress {
+      .mdc-linear-progress__bar-inner {
+        border-color: $brand-blue !important;
+      }
     }
   }
 }
 
 // ===== Footer =====
 .login-footer {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 1rem;
-  padding: 0.75rem 1.5rem;
-  position: relative;
+  text-align: center;
+  padding: 1rem;
   margin-top: auto;
-  flex-shrink: 0;
+  font-size: 0.8rem;
+  color: $text-muted;
+  border-top: 1px solid $input-border;
 
-  .reload-button {
-    color: var(--mat-app-text-color, #c4c6d0);
-    opacity: 0.6;
-    transition: all 0.2s ease;
-    background: transparent;
-    border: none;
-    flex-shrink: 0;
+  a {
+    color: $brand-blue;
+    text-decoration: none;
+    font-weight: 500;
 
     &:hover {
-      opacity: 1;
-      transform: rotate(90deg);
+      text-decoration: underline;
     }
   }
 }
 
-// ===== Modern Menus =====
-::ng-deep .modern-menu {
-  border-radius: 12px;
-  box-shadow:
-    0 4px 12px #0000001a,
-    0 2px 4px #0000000f;
+// ===== Version Info =====
+.login-version-info {
+  margin-bottom: 1rem;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
 
-  .mat-mdc-menu-item {
-    border-radius: 8px;
-    margin: 4px 8px;
-    transition: all 0.2s ease;
+.version-info-container {
+  width: 100%;
+  background: $input-bg;
+  border-radius: 10px;
+  padding: 0.75rem 1rem;
+  border: 1px solid $input-border;
+}
 
-    .menu-icon {
-      margin-right: 0.75rem;
-      color: var(--md-sys-color-primary, #1074b9);
-      opacity: 0.7;
-    }
+.version-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0.4rem 0;
+  border-bottom: 1px solid $input-border;
 
-    &:hover .menu-icon {
-      opacity: 1;
-    }
+  &:last-child {
+    border-bottom: none;
   }
 }
 
-// ===== Animations =====
-@keyframes fade-in {
-  from {
-    opacity: 0;
+.version-label {
+  font-weight: 500;
+  font-size: 0.75rem;
+  color: $text-muted;
+}
+
+.version-value {
+  font-weight: 400;
+  font-size: 0.75rem;
+  color: $text-dark;
+  text-align: right;
+  word-break: break-word;
+  max-width: 60%;
+}
+
+// ===== Dark Mode =====
+:host-context(.dark-theme),
+:host-context([data-theme='dark']) {
+  .login-panel {
+    background: #1e1e1e;
   }
 
-  to {
-    opacity: 1;
+  .card-title {
+    color: #e2e2e5;
   }
-}
 
-@keyframes fade-in-up {
-  from {
-    opacity: 0;
-    transform: translateY(20px);
+  .card-subtitle {
+    color: #a0a0a0;
   }
 
-  to {
-    opacity: 1;
-    transform: translateY(0);
+  .login-footer {
+    color: #a0a0a0;
+    border-top-color: #333;
   }
 }
 
-@keyframes fade-in-down {
+// ===== Animations =====
+@keyframes fade-in-up {
   from {
     opacity: 0;
-    transform: translateY(-20px);
+    transform: translateY(20px);
   }
 
   to {
@@ -699,76 +379,29 @@
   }
 }
 
-// ===== Responsive Design =====
+// ===== Responsive =====
 
-// Tablet
 /* stylelint-disable-next-line media-feature-range-notation -- Safari compatibility */
 @media (max-width: 1024px) {
   .hero-panel {
     display: none;
   }
 
-  .login-wrapper {
-    min-height: 100vh;
-    height: 100%;
-  }
-
   .login-panel {
     flex: 1;
     width: 100%;
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .login-header {
-    flex-shrink: 0;
   }
 
   .login-card-container {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    padding: 0;
-    width: 100%;
-    height: 100%;
+    padding: 2rem;
   }
 
   .login-card {
-    flex: 1;
-    width: 100%;
-    max-width: 100%;
-    border-radius: 0;
-    padding: 1.5rem 2rem;
-    margin: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-
-  .logo-section {
-    flex-shrink: 0;
-  }
-
-  .form-section {
-    flex-shrink: 0;
-  }
-
-  .login-version-info {
-    margin-top: auto;
-  }
-
-  .login-footer {
-    flex-shrink: 0;
-  }
-
-  // Hide resources section on medium screens
-  .resources-section {
-    display: none;
+    max-width: 440px;
+    margin: 0 auto;
   }
 }
 
-// Mobile
 /* stylelint-disable-next-line media-feature-range-notation -- Safari compatibility */
 @media (max-width: 768px) {
   .login-wrapper {
@@ -779,142 +412,31 @@
     display: none;
   }
 
-  .login-panel {
-    min-height: 100vh;
-  }
-
   .login-card-container {
-    padding: 0 1rem 1rem;
-    justify-content: center;
-    height: auto;
-    min-height: calc(100vh - 56px); // 56px for header
-  }
-
-  .login-header {
-    padding: 0.75rem 1rem;
-    gap: 0.25rem;
-
-    ::ng-deep mifosx-language-selector {
-      width: 30%;
-
-      #language-selector.outlined-variant {
-        width: 100%;
-        font-size: 0.8rem;
-      }
-    }
-
-    ::ng-deep mifosx-server-selector {
-      width: 60%;
-
-      #server-selector.outlined-variant {
-        width: 100%;
-        font-size: 0.8rem;
-      }
-    }
-
-    ::ng-deep mifosx-theme-toggle {
-      button {
-        padding: 8px;
-
-        mat-icon {
-          font-size: 20px;
-          width: 20px;
-          height: 20px;
-        }
-      }
-    }
+    padding: 1.5rem 1rem;
   }
 
   .login-card {
-    padding: 0.75rem 1rem;
-    border-radius: 24px;
-    margin: 0;
-  }
-
-  .logo-section {
-    margin-bottom: 0.5rem;
-    padding-bottom: 0.5rem;
-  }
-
-  .logo-image {
-    height: 100px;
-    width: auto;
-    margin: 8px 20px;
-  }
-
-  // Hide resources section on medium and small screens
-  .resources-section {
-    display: none;
-  }
-
-  .form-section {
-    margin-bottom: 0.75rem;
-  }
-
-  .login-version-info {
-    margin-bottom: 0.75rem;
-    width: 100%;
-    justify-content: center;
-    align-items: center;
-    font-size: 0.85rem;
+    max-width: 100%;
   }
 
   .login-footer {
-    flex-direction: column;
-    align-items: center;
-    padding: 0.5rem;
-
-    mifosx-footer {
-      text-align: center;
-    }
-
-    .reload-button {
-      color: var(--md-sys-color-on-surface-variant, #c4c6d0);
-      border: none;
-      margin-top: 0.5rem;
-    }
+    padding: 0.75rem;
   }
 }
 
-// Small mobile
 /* stylelint-disable-next-line media-feature-range-notation -- Safari compatibility */
 @media (max-width: 480px) {
-  .login-header {
-    padding: 0.5rem 0.75rem;
-    gap: 0.25rem;
-  }
-
   .login-card-container {
-    padding: 0 0.5rem 0.5rem;
-    justify-content: center;
-  }
-
-  .login-card {
-    padding: 0.75rem 0.875rem;
-  }
-
-  .logo-section {
-    margin-bottom: 0.5rem;
-    padding-bottom: 0.25rem;
+    padding: 1rem 0.75rem;
   }
 
-  .logo-image {
-    height: 80px;
-    width: auto;
-    margin: 4px 16px;
-  }
-
-  .form-section {
-    margin-bottom: 0.5rem;
-  }
-
-  // Hide resources section on small screens
-  .resources-section {
-    display: none;
+  .card-subtitle {
+    margin-bottom: 1.25rem;
   }
 
   .login-footer {
-    padding: 0.25rem 1rem;
+    padding: 0.5rem;
   }
 }
 
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 9e1aaac252..ab9d433d74 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -33,17 +33,11 @@ import { TranslateService } from '@ngx-translate/core';
 /** Environment Imports */
 import { environment } from '../../environments/environment';
 import { SettingsService } from 'app/settings/settings.service';
-import { LanguageSelectorComponent } from '../shared/language-selector/language-selector.component';
-import { ThemeToggleComponent } from '../shared/theme-toggle/theme-toggle.component';
-import { ServerSelectorComponent } from '../shared/server-selector/server-selector.component';
 import { TenantSelectorComponent } from '../shared/tenant-selector/tenant-selector.component';
 import { LoginFormComponent } from './login-form/login-form.component';
 import { ResetPasswordComponent } from './reset-password/reset-password.component';
 import { TwoFactorAuthenticationComponent } from './two-factor-authentication/two-factor-authentication.component';
-import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { M3IconComponent } from '../shared/m3-ui/m3-icon/m3-icon.component';
 
 import { VersionService } from '../system/version.service';
 
@@ -56,18 +50,10 @@ import { VersionService } from '../system/version.service';
   styleUrls: ['./login.component.scss'],
   imports: [
     ...STANDALONE_SHARED_IMPORTS,
-    LanguageSelectorComponent,
-    ThemeToggleComponent,
-    ServerSelectorComponent,
     TenantSelectorComponent,
     LoginFormComponent,
     ResetPasswordComponent,
-    TwoFactorAuthenticationComponent,
-    MatMenuTrigger,
-    FaIconComponent,
-    MatMenu,
-    MatMenuItem,
-    M3IconComponent
+    TwoFactorAuthenticationComponent
   ],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
@@ -104,8 +90,8 @@ export class LoginComponent implements OnInit {
   resetPassword = false;
   /** True if user requires two factor authentication. */
   twoFactorAuthenticationRequired = false;
-  logoPath = 'assets/images/default_home.png';
-  logoPathDark = 'assets/images/white-mifos.png';
+  logoPath = 'assets/images/debug-bg.png';
+  logoPathDark = 'assets/images/debug-bg.png';
 
   themeDarkEnabled: boolean = false;
 
@@ -209,22 +195,22 @@ export class LoginComponent implements OnInit {
     if (environment.tenantLogoUrl && environment.tenantLogoUrl.trim() !== '') {
       this.logoPath = environment.tenantLogoUrl;
     } else {
-      this.logoPath = isTenantSpecific ? `assets/images/${tenant}_home.png` : 'assets/images/default_home.png';
+      this.logoPath = isTenantSpecific ? `assets/images/${tenant}_home.png` : 'assets/images/debug-bg.png';
     }
 
     // Set dark mode logo (env override takes priority)
     if (environment.tenantLogoUrlDark && environment.tenantLogoUrlDark.trim() !== '') {
       this.logoPathDark = environment.tenantLogoUrlDark;
     } else {
-      this.logoPathDark = isTenantSpecific ? `assets/images/${tenant}_home_dark.png` : 'assets/images/white-mifos.png';
+      this.logoPathDark = isTenantSpecific ? `assets/images/${tenant}_home_dark.png` : 'assets/images/debug-bg.png';
     }
   }
 
   onLogoError(): void {
-    this.logoPath = 'assets/images/default_home.png';
+    this.logoPath = 'assets/images/debug-bg.png';
   }
 
   onLogoErrorDark(): void {
-    this.logoPathDark = 'assets/images/white-mifos.png';
+    this.logoPathDark = 'assets/images/debug-bg.png';
   }
 }
diff --git a/src/app/products/loan-products/common/loan-product-base.component.ts b/src/app/products/loan-products/common/loan-product-base.component.ts
index d98debe2c8..926ce43625 100644
--- a/src/app/products/loan-products/common/loan-product-base.component.ts
+++ b/src/app/products/loan-products/common/loan-product-base.component.ts
@@ -35,7 +35,7 @@ export abstract class LoanProductBaseComponent {
   protected reload() {
     const url: string = this.router.url.split('?')[0];
     this.router
-      .navigateByUrl(`/clients`, { skipLocationChange: true })
+      .navigateByUrl(`/members`, { skipLocationChange: true })
       .then(() =>
         this.router.navigate([url], { queryParams: { productType: this.loanProductService.productType.value } })
       );
diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts
index 6120115289..027d036949 100644
--- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts
+++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts
@@ -290,7 +290,7 @@ export class TransactionsTabComponent implements OnInit {
     const clientId = this.route.parent.parent.snapshot.params['clientId'];
     const url: string = this.router.url;
     this.router
-      .navigateByUrl(`/clients/${clientId}/savings-accounts`, { skipLocationChange: true })
+      .navigateByUrl(`/members/${clientId}/savings-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 }
diff --git a/src/app/shared/account-number/account-number.component.ts b/src/app/shared/account-number/account-number.component.ts
index 7a8fe26052..c0df763b3a 100644
--- a/src/app/shared/account-number/account-number.component.ts
+++ b/src/app/shared/account-number/account-number.component.ts
@@ -53,7 +53,7 @@ export class AccountNumberComponent implements OnInit {
 
   getAccountLink(): string {
     if (this.accountType) {
-      return `/#/clients/${this.clientId}/${this.getAccountType()}/${this.accountId}`;
+      return `/#/members/${this.clientId}/${this.getAccountType()}/${this.accountId}`;
     }
     return '';
   }
diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html
index a534f3992f..e126f8603b 100644
--- a/src/app/shared/footer/footer.component.html
+++ b/src/app/shared/footer/footer.component.html
@@ -29,56 +29,15 @@
   </div>
 } @else {
   <!-- Default mode for Shell -->
-  @if (displayBackEndInfo) {
-    <div class="layout-column m-b-20 f12" ngClass="{{ styleClass }}" id="footer">
-      <div class="layout-column m-t-10 m-b-10 content-wrapper footer-center">
-        <table class="versions">
-          <tr>
-            <td class="footer-content">{{ 'APP_NAME' | translate }}</td>
-            <td class="right footer-content">
-              {{ versions.mifos }} - <b>{{ hash }}</b>
-            </td>
-          </tr>
-          <tr>
-            <td class="footer-content">{{ 'labels.text.Fineract' | translate }}</td>
-            <td class="right footer-content">
-              {{ versions.fineract.version }} - <b>{{ versions.fineract.hash }}</b>
-            </td>
-          </tr>
-          <tr>
-            <td class="footer-content">{{ 'labels.inputs.Server' | translate }}</td>
-            <td class="right footer-content">
-              {{ server }}
-            </td>
-          </tr>
-          <tr>
-            <td class="footer-content">{{ 'labels.version.Username' | translate }}</td>
-            <td class="right footer-content">
-              {{ username }}
-            </td>
-          </tr>
-          <tr>
-            <td class="footer-content">{{ 'labels.version.Name' | translate }}</td>
-            <td class="right footer-content">
-              {{ name }}
-            </td>
-          </tr>
-          <tr>
-            <td class="footer-content">{{ 'labels.version.Render Time' | translate }}</td>
-            <td class="right footer-content">
-              {{ renderTime | date: 'dd MMMM yyyy HH:mm:ss' }}
-            </td>
-          </tr>
-          @if (isBusinessDateDefined) {
-            <tr>
-              <td class="footer-content">{{ 'labels.text.Current Business Date' | translate }}:</td>
-              <td class="right footer-content business-date">
-                <b>{{ businessDate | date: 'EEEE, MMMM dd, y' }}</b>
-              </td>
-            </tr>
-          }
-        </table>
-      </div>
-    </div>
-  }
+  <div class="footer-shell" ngClass="{{ styleClass }}">
+    <span class="footer-copyright">
+      &copy; {{ currentYear }} {{ 'APP_NAME' | translate }}. All rights reserved. Developed by
+      <a href="https://dibugsoft.com/" target="_blank" rel="noopener noreferrer">Debugsoft</a>
+    </span>
+    @if (isBusinessDateDefined) {
+      <span class="footer-business-date">
+        {{ 'labels.text.Current Business Date' | translate }}: <b>{{ businessDate | date: 'EEEE, MMMM dd, y' }}</b>
+      </span>
+    }
+  </div>
 }
diff --git a/src/app/shared/footer/footer.component.scss b/src/app/shared/footer/footer.component.scss
index 3d64d441d9..145a6c61e4 100644
--- a/src/app/shared/footer/footer.component.scss
+++ b/src/app/shared/footer/footer.component.scss
@@ -61,55 +61,33 @@
 }
 
 // ===== Default Mode (Shell) =====
-#footer {
+.footer-shell {
+  display: flex;
+  flex-direction: column;
   align-items: center;
-  min-width: 400px;
-
-  .content-wrapper {
-    max-width: 100%;
-    min-width: 90%;
-    padding-left: 5%;
-    padding-right: 5%;
+  gap: 0.25rem;
+  padding: 1rem 0;
+  font-size: 0.8rem;
+  color: var(--md-sys-color-on-surface-variant, #44474e);
 
-    .versions {
-      width: 100%;
-      color: $status-inactive;
-    }
+  a {
+    color: inherit;
+    text-decoration: none;
+    font-weight: 500;
 
-    .footer-content {
-      margin: 0;
+    &:hover {
+      text-decoration: underline;
     }
   }
 
-  .divider {
-    margin: 2.5rem 1rem 0.5rem;
-    width: 4rem;
-  }
-
-  .business-date {
+  .footer-business-date {
     color: $status-approved;
+    font-size: 0.75rem;
   }
-
-  table {
-    border: none;
-
-    tr:nth-child(even) {
-      background-color: transparent;
-    }
-  }
-}
-
-.main-page {
-  max-width: 70%;
-  min-width: 50%;
-  padding-left: 30%;
 }
 
-.copy-label {
-  min-width: 100%;
-  text-align: center;
-  font-size: medium;
-  margin-bottom: 10px;
+.dark-theme .footer-shell {
+  color: var(--md-sys-color-on-surface-variant, #c4c6d0);
 }
 
 // ===== Responsive for Compact Mode =====
diff --git a/src/app/shared/footer/footer.component.ts b/src/app/shared/footer/footer.component.ts
index d8cef4b239..1514e36f8d 100644
--- a/src/app/shared/footer/footer.component.ts
+++ b/src/app/shared/footer/footer.component.ts
@@ -76,6 +76,7 @@ export class FooterComponent implements OnInit, OnDestroy {
   timer: any;
 
   displayBackEndInfo = true;
+  currentYear = new Date().getFullYear();
 
   constructor() {
     this.displayBackEndInfo = environment.displayBackEndInfo === 'true';
diff --git a/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts
index 741cc351f1..c9f60807a8 100644
--- a/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts
+++ b/src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts
@@ -172,7 +172,7 @@ export class LoanLockedComponent implements OnInit {
     const loanId = loan.loanId;
     this.loansService.getLoanAccountDetails(loanId).subscribe((loanData: any) => {
       const clientId = loanData.clientId;
-      this.router.navigateByUrl(`/clients/${clientId}/loans-accounts/${loanId}/general`);
+      this.router.navigateByUrl(`/members/${clientId}/loans-accounts/${loanId}/general`);
     });
   }
 
diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/client-approval/client-approval.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/client-approval/client-approval.component.html
index 7e5d88b271..1f78f80c18 100644
--- a/src/app/tasks/checker-inbox-and-tasks-tabs/client-approval/client-approval.component.html
+++ b/src/app/tasks/checker-inbox-and-tasks-tabs/client-approval/client-approval.component.html
@@ -55,19 +55,19 @@ <h3>{{ client.key }}</h3>
           </ng-container>
           <ng-container matColumnDef="name">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.name' | translate }}</th>
-            <td mat-cell *matCellDef="let element" class="view-details" [routerLink]="['../../clients', element.id]">
+            <td mat-cell *matCellDef="let element" class="view-details" [routerLink]="['../../members', element.id]">
               {{ element.displayName }}
             </td>
           </ng-container>
           <ng-container matColumnDef="accountNumber">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account Number' | translate }}</th>
-            <td mat-cell *matCellDef="let element" class="view-details" [routerLink]="['../../clients', element.id]">
+            <td mat-cell *matCellDef="let element" class="view-details" [routerLink]="['../../members', element.id]">
               {{ element.accountNo }}
             </td>
           </ng-container>
           <ng-container matColumnDef="staff">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Staff' | translate }}</th>
-            <td mat-cell *matCellDef="let element" class="view-details" [routerLink]="['../../clients', element.id]">
+            <td mat-cell *matCellDef="let element" class="view-details" [routerLink]="['../../members', element.id]">
               {{ element.staffName }}
             </td>
           </ng-container>
diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/council-approval/council-approval.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/council-approval/council-approval.component.html
index c4dbf968f5..b124b40acf 100644
--- a/src/app/tasks/checker-inbox-and-tasks-tabs/council-approval/council-approval.component.html
+++ b/src/app/tasks/checker-inbox-and-tasks-tabs/council-approval/council-approval.component.html
@@ -56,7 +56,7 @@ <h3 class="mat-h3">{{ office.name }}</h3>
               mat-cell
               *matCellDef="let loan"
               class="view-details"
-              [routerLink]="['../../clients', loan.clientId, 'general']"
+              [routerLink]="['../../members', loan.clientId, 'general']"
             >
               {{ loan.clientName }}
             </td>
@@ -67,7 +67,7 @@ <h3 class="mat-h3">{{ office.name }}</h3>
               mat-cell
               *matCellDef="let loan"
               class="view-details"
-              [routerLink]="['../../clients', loan.clientId, 'loans-accounts', loan.id]"
+              [routerLink]="['../../members', loan.clientId, 'loans-accounts', loan.id]"
             >
               {{ loan.loanProductName }}({{ loan.accountNo }})
             </td>
diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html
index 901b984705..88f642e9e1 100644
--- a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html
+++ b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.html
@@ -56,7 +56,7 @@ <h3 class="mat-h3">{{ office.name }}</h3>
               mat-cell
               *matCellDef="let loan"
               class="view-details"
-              [routerLink]="['../../clients', loan.clientId, 'general']"
+              [routerLink]="['../../members', loan.clientId, 'general']"
             >
               {{ loan.clientName }}
             </td>
@@ -67,7 +67,7 @@ <h3 class="mat-h3">{{ office.name }}</h3>
               mat-cell
               *matCellDef="let loan"
               class="view-details"
-              [routerLink]="['../../clients', loan.clientId, 'loans-accounts', loan.id]"
+              [routerLink]="['../../members', loan.clientId, 'loans-accounts', loan.id]"
             >
               {{ loan.loanProductName }}({{ loan.accountNo }})
             </td>
diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html
index ab8b7b19ed..e17c9d6420 100644
--- a/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html
+++ b/src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.html
@@ -54,7 +54,7 @@
           mat-cell
           *matCellDef="let loan"
           class="view-details"
-          [routerLink]="['../../clients', loan.clientId, 'general']"
+          [routerLink]="['../../members', loan.clientId, 'general']"
         >
           {{ loan.clientName }}
         </td>
@@ -65,7 +65,7 @@
           mat-cell
           *matCellDef="let loan"
           class="view-details"
-          [routerLink]="['../../clients', loan.clientId, 'loans-accounts', loan.id, 'general']"
+          [routerLink]="['../../members', loan.clientId, 'loans-accounts', loan.id, 'general']"
         >
           {{ loan.accountNo }}
         </td>
@@ -76,7 +76,7 @@
           mat-cell
           *matCellDef="let loan"
           class="view-details"
-          [routerLink]="['../../clients', loan.clientId, 'loans-accounts', loan.id, 'general']"
+          [routerLink]="['../../members', loan.clientId, 'loans-accounts', loan.id, 'general']"
         >
           {{ loan.loanProductName }}
         </td>
diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/reschedule-loan/reschedule-loan.component.html b/src/app/tasks/checker-inbox-and-tasks-tabs/reschedule-loan/reschedule-loan.component.html
index 7e33a461ed..604a85bb18 100644
--- a/src/app/tasks/checker-inbox-and-tasks-tabs/reschedule-loan/reschedule-loan.component.html
+++ b/src/app/tasks/checker-inbox-and-tasks-tabs/reschedule-loan/reschedule-loan.component.html
@@ -63,7 +63,7 @@
           mat-cell
           *matCellDef="let loan"
           class="view-details"
-          [routerLink]="['../../clients', loan.clientId, 'general']"
+          [routerLink]="['../../members', loan.clientId, 'general']"
         >
           {{ loan.clientName }}
         </td>
@@ -78,7 +78,7 @@
           mat-cell
           *matCellDef="let loan"
           class="view-details"
-          [routerLink]="['../../clients', loan.clientId, 'loans', loan.loanId, 'general']"
+          [routerLink]="['../../members', loan.clientId, 'loans', loan.loanId, 'general']"
         >
           {{ loan.loanAccountNumber }}
         </td>
diff --git a/src/app/web-app.component.ts b/src/app/web-app.component.ts
index 8783ae1561..30ae863ed5 100644
--- a/src/app/web-app.component.ts
+++ b/src/app/web-app.component.ts
@@ -188,14 +188,8 @@ export class WebAppComponent implements OnInit, OnDestroy {
         mergeMap((route) => route.data),
         takeUntil(this.destroy$)
       )
-      .subscribe((event) => {
-        const title = event['title'] ? `labels.text.${event['title']}` : 'APP_NAME';
-        this.i18nService
-          .translate(title)
-          .pipe(take(1))
-          .subscribe((titleTranslated: any) => {
-            this.titleService.setTitle(titleTranslated);
-          });
+      .subscribe(() => {
+        this.titleService.setTitle('COIMS');
       });
 
     // Stores top 100 user activites as local storage object.
diff --git a/src/apple-touch-icon.png b/src/apple-touch-icon.png
index a9b5bc492a..f8399ba1e2 100644
Binary files a/src/apple-touch-icon.png and b/src/apple-touch-icon.png differ
diff --git a/src/assets/images/MifosX_logo.png b/src/assets/images/MifosX_logo.png
deleted file mode 100644
index 33ebffdcc1..0000000000
Binary files a/src/assets/images/MifosX_logo.png and /dev/null differ
diff --git a/src/assets/images/MifosX_logoSmall.png b/src/assets/images/MifosX_logoSmall.png
deleted file mode 100644
index dc471dfb87..0000000000
Binary files a/src/assets/images/MifosX_logoSmall.png and /dev/null differ
diff --git a/src/assets/images/cover_image_resized.webp b/src/assets/images/cover_image_resized.webp
deleted file mode 100644
index 3ea1cbe5a0..0000000000
Binary files a/src/assets/images/cover_image_resized.webp and /dev/null differ
diff --git a/src/assets/images/debug-bg.png b/src/assets/images/debug-bg.png
new file mode 100644
index 0000000000..f8399ba1e2
Binary files /dev/null and b/src/assets/images/debug-bg.png differ
diff --git a/src/assets/images/debug.png b/src/assets/images/debug.png
new file mode 100644
index 0000000000..cf3afb8966
Binary files /dev/null and b/src/assets/images/debug.png differ
diff --git a/src/assets/images/default_home.png b/src/assets/images/default_home.png
index e32d310191..cf3afb8966 100644
Binary files a/src/assets/images/default_home.png and b/src/assets/images/default_home.png differ
diff --git a/src/assets/images/hero.jpg b/src/assets/images/hero.jpg
new file mode 100644
index 0000000000..210dc7a1cf
Binary files /dev/null and b/src/assets/images/hero.jpg differ
diff --git a/src/assets/images/mifos-logo-flat.png b/src/assets/images/mifos-logo-flat.png
deleted file mode 100644
index 30a166d641..0000000000
Binary files a/src/assets/images/mifos-logo-flat.png and /dev/null differ
diff --git a/src/assets/images/mifos_lg-logo.jpg b/src/assets/images/mifos_lg-logo.jpg
deleted file mode 100644
index a067a3c8ed..0000000000
Binary files a/src/assets/images/mifos_lg-logo.jpg and /dev/null differ
diff --git a/src/assets/images/white-mifos.png b/src/assets/images/white-mifos.png
deleted file mode 100644
index 5bc3f75d37..0000000000
Binary files a/src/assets/images/white-mifos.png and /dev/null differ
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index f71201b9ae..3f753d9505 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Přihlášen jako",
   "Remember me": "Zapamatuj si mě",
   "error.resource.notImplemented.type": "Nenaimplementovaná chyba",
@@ -433,6 +433,7 @@
     "version": {
       "Tenant": "Instanci",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Server",
       "Username": "Uživatelské jméno",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index 8c8e56a520..1fe38bf4a9 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Angemeldet als",
   "Remember me": "Erinnere dich an mich",
   "error.resource.notImplemented.type": "Nicht implementierter Fehler",
@@ -434,6 +434,7 @@
     "version": {
       "Tenant": "Mieter",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Server",
       "Username": "Benutzername",
@@ -4386,7 +4387,7 @@
       "APPROVEADDITIONAL": "Zusätzlich genehmigen",
       "ASSIGNROLE": "Rolle zuweisen",
       "ASSIGNSTAFF": "Personal zuweisen",
-      "ASSOCIATECLIENTS": "Clients zuordnen",
+      "ASSOCIATECLIENTS": "Members zuordnen",
       "ASSOCIATEGROUPS": "Gruppen zuordnen",
       "ATTACH": "Anfügen",
       "BLOCK": "Blockieren",
@@ -4442,7 +4443,7 @@
       "SETTLECASHFROMCASHIER": "Bargeld vom Kassier begleichen",
       "SETTLECASHIER": "Kassier begleichen",
       "TRANSFER": "Überweisung",
-      "TRANSFERCLIENTS": "Clients übertragen",
+      "TRANSFERCLIENTS": "Members übertragen",
       "UNASSIGNROLE": "Rolle entfernen",
       "UNASSIGNSTAFF": "Personal entfernen",
       "UNBLOCK": "Freigeben",
@@ -4484,7 +4485,7 @@
       "CLIENTIDENTIFIER": "Client-Kennung",
       "CLIENTIMAGE": "Client-Bild",
       "CLIENT_COLLATERAL_PRODUCT": "Client-Sicherheitsprodukt",
-      "CLIENTS": "Clients",
+      "CLIENTS": "Members",
       "CODE": "Code",
       "CODEVALUE": "Codewert",
       "COLLATERAL": "Sicherheit",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 614c645bf7..26427d21eb 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Logged in as",
   "Remember me": "Remember me",
   "error.resource.notImplemented.type": "Not Implemented Error",
@@ -434,7 +434,8 @@
     "Mifos Reporting Plugin for Eclipse Birt": "Mifos Reporting Plugin for Eclipse Birt",
     "version": {
       "Tenant": "Tenant",
-      "Mifos WebApp": "Mifos® WebApp",
+      "Mifos WebApp": "WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Server",
       "Username": "Username",
@@ -502,7 +503,7 @@
       "Add": "Add",
       "Add Account": "Add Account",
       "Add Charge": "Add Charge",
-      "Add Clients": "Add Clients",
+      "Add Clients": "Add Members",
       "Add Code Value": "Add Code Value",
       "Add Collateral": "Add Collateral",
       "Add Column": "Add Column",
@@ -727,7 +728,7 @@
       "Take Survey": "Take Survey",
       "Transaction Reverted": "Transaction Reverted",
       "Transfer Client": "Transfer Client",
-      "Transfer Clients": "Transfer Clients",
+      "Transfer Clients": "Transfer Members",
       "Unassign Staff": "Unassign Staff",
       "Undo": "Undo",
       "Undo Rejection": "Undo Rejection",
@@ -1189,7 +1190,7 @@
       "Client Collateral Details": "Client Collateral Details",
       "Client Members": "Client Members",
       "Client Type": "Client Type",
-      "Clients": "Clients",
+      "Clients": "Members",
       "Closing Entries": "Closing Entries",
       "Collateral Data": "Collateral Data",
       "Collateral Management": "Collateral Management",
@@ -1490,7 +1491,7 @@
       "Search bar to filter users": "Search bar to filter users",
       "Secure & Reliable": "Secure & Reliable",
       "Select Excel File": "Select Excel File",
-      "Selected Clients": "Selected Clients",
+      "Selected Clients": "Selected Members",
       "Selected Groups": "Selected Groups",
       "Selected Jobs": "Selected Jobs",
       "Session Timeout": "Session Timeout",
@@ -1604,7 +1605,7 @@
       "Active": "Active",
       "Active Client Borrowers": "Active Client Borrowers",
       "Active Client Loans": "Active Client Loans",
-      "Active Clients": "Active Clients",
+      "Active Clients": "Active Members",
       "Active Group Borrowers": "Active Group Borrowers",
       "Active Group Loans": "Active Group Loans",
       "Active Overdue Client Loans": "Active Overdue Client Loans",
@@ -1615,7 +1616,7 @@
       "Actual Balance": "Actual Balance",
       "Actual Discount Fee Balance": "Actual Discount Fee Balance",
       "Actual Payment": "Actual Payment",
-      "Add Clients": "Add Clients",
+      "Add Clients": "Add Members",
       "Add Fee Frequency": "Add Fee Frequency",
       "Add Groups": "Add Groups",
       "Add Journal Entries": "Add Journal Entries",
@@ -1805,7 +1806,7 @@
       "Client last name": "Client last name",
       "Client middle name": "Client middle name",
       "Client name": "Client name",
-      "Clients": "Clients",
+      "Clients": "Members",
       "Close Date": "Close Date",
       "Closed (obligations met)": "Closed (obligations met)",
       "Closed (written-off)": "Closed (written-off)",
@@ -2503,11 +2504,11 @@
       "Number Value": "Number Value",
       "Number of Active Client Borrowers": "Number of Active Client Borrowers",
       "Number of Active Client Loans": "Number of Active Client Loans",
-      "Number of Active Clients": "Number of Active Clients",
+      "Number of Active Clients": "Number of Active Members",
       "Number of Active Overdue Client Loans": "Number of Active Overdue Client Loans",
       "Number of Active Overdue Group Loans": "Number of Active Overdue Group Loans",
       "Number of Centers": "Number of Centers",
-      "Number of Clients": "Number of Clients",
+      "Number of Clients": "Number of Members",
       "Number of Collaterals": "Number Of Collaterals",
       "Number of Days to Dormant sub-status": "Number of Days to Dormant sub-status",
       "Number of Days to Escheat": "Number of Days to Escheat",
@@ -3144,7 +3145,7 @@
       "Charge-Off": "Charge-Off",
       "Chart of Accounts": "Chart of Accounts",
       "Checker Inbox and Tasks": "Checker Inbox and Tasks",
-      "Clients": "Clients",
+      "Clients": "Members",
       "Close": "Close",
       "Close (as Rescheduled)": "Close (as Rescheduled)",
       "Collection Sheet": "Collection Sheet",
@@ -3393,8 +3394,8 @@
       "ClientCreateBusinessEvent": "Client Create Business Event",
       "ClientName": "ClientName",
       "ClientRejectBusinessEvent": "Client Reject Business Event",
-      "Clients": "Clients",
-      "Clients View": "Clients View",
+      "Clients": "Members",
+      "Clients View": "Members View",
       "Codes": "Codes",
       "Codes are used to define drop down values": "Codes are used to define drop down values",
       "Collateral": "Collateral",
@@ -3929,16 +3930,16 @@
       "Scheduler Jobs can set batch jobs": "By using Scheduler Jobs, you can set batch jobs to be completed at regular intervals. From this page you can schedule, modify or delete jobs.",
       "Search": "Search",
       "Search Journal Entry": "Search Journal Entry",
-      "Search and assign this beneficiary to an existing Mifos client account": "Search and assign this beneficiary to an existing Mifos client account",
+      "Search and assign this beneficiary to an existing Mifos member account": "Search and assign this beneficiary to an existing Mifos member account",
       "Search bar to filter fixed deposit products.": "Search bar to filter fixed deposit products.",
       "Search by Text": "Search by Text",
       "Search by user": "Search by user",
-      "SearchByClient": "Search by client name, external Id, mobile",
+      "SearchByClient": "Search by member name, external Id, mobile",
       "SearchByExternalID": "Search by ExternalID",
       "SearchByName": "Search by Name",
       "Section Buttons": "This section contains user name, user photograph, user settings and sign out button.",
       "SelectDate": "Select date",
-      "SelectOrTypeClientName": "Select or type client name",
+      "SelectOrTypeClientName": "Select or type member name",
       "Selection you can create new drop-downs and edit": "From this selection you can create new drop-downs and edit their values as well as edit the values for system-generated codes and drop-downs.",
       "Self Service": "Self Service",
       "Self Service App Configuration": "Self Service App Configuration",
@@ -4262,7 +4263,7 @@
         "CLIENTIDENTIFIER": "Client Identifier",
         "CLIENTIMAGE": "Client Image",
         "CLIENT_COLLATERAL_PRODUCT": "Client Collateral Product",
-        "CLIENTS": "Clients",
+        "CLIENTS": "Members",
         "CODE": "Code",
         "CODEVALUE": "Code Value",
         "COLLATERAL": "Collateral",
diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json
index 559e5c209b..e7d8433541 100644
--- a/src/assets/translations/es-CL.json
+++ b/src/assets/translations/es-CL.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Conectado como",
   "Remember me": "Recordar me",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Instancia",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Servidor",
       "Username": "Nombre de usuario",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index 1cf2e51d4a..df2c975205 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Conectado como",
   "Remember me": "Recordar me",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Instancia",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Servidor",
       "Username": "Usuario",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index ade1eaa9b7..c6cc1fae60 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "connecté en tant que",
   "Remember me": "Souviens-toi de moi",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Locataire",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Serveur",
       "Username": "Nom d'utilisateur",
@@ -4156,7 +4157,7 @@
         "CLIENTIDENTIFIER": "Identifiant client",
         "CLIENTIMAGE": "Image client",
         "CLIENT_COLLATERAL_PRODUCT": "Produit de garantie client",
-        "CLIENTS": "Clients",
+        "CLIENTS": "Members",
         "CODE": "Code",
         "CODEVALUE": "Valeur de code",
         "COLLATERAL": "Garantie",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 8c46d50665..342a87a9fa 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Collegato come",
   "Remember me": "Ricordati di me",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Inquilino",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Server",
       "Username": "Nome utente",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 3849cd2460..628ab5b7a7 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "다음 계정으로 로그인됨",
   "Remember me": "날 기억해",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "임차인",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "서버",
       "Username": "사용자 이름",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index b00c7e0597..4c157bef05 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "prisijungęs kaip",
   "Remember me": "Prisimink mane",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Nuomininkas",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Serveris",
       "Username": "Vartotojo vardas",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 89b1b48f89..63b9137762 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "ielogojies Kā",
   "Remember me": "Atceries mani",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Nomnieks",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Serveris",
       "Username": "Lietotājvārds",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index 5bd741567a..b605e2a167 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "को रूपमा लग इन गरियो",
   "Remember me": "मलाई सम्झनुहोस्",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "भाडामा लिने व्यक्ति",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "सर्भर",
       "Username": "प्रयोगकर्ता नाम",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index c237d693ff..968cc908cb 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "logado como",
   "Remember me": "Lembre de mim",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Inquilino",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Servidor",
       "Username": "Nome de usuário",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index 2b61c54b67..b9efb6e2db 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -1,5 +1,5 @@
 {
-  "APP_NAME": "Mifos® X WebApp",
+  "APP_NAME": "COIMS",
   "Logged in as": "Imeingia kama",
   "Remember me": "Nikumbuke",
   "errors": {
@@ -432,6 +432,7 @@
     "version": {
       "Tenant": "Mpangaji",
       "Mifos WebApp": "Mifos® WebApp",
+      "WebApp": "WebApp",
       "Apache Fineract": "Apache Fineract®",
       "Server": "Seva",
       "Username": "Jina la mtumiaji",
diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index ff0cdf68ea..96d63cccab 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -1,9 +1,16 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '260108',
-    'hash': 'g5af11fe75'
+    'version': '260619',
+    'hash': '070b861e'
   },
   'allow_switching_backend_instance': true
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index f0ba9fbcd5..af26a78690 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -25,12 +25,11 @@ export const environment = {
   fineractPlatformTenantId: loadedEnv['fineractPlatformTenantId'] || 'default',
   fineractPlatformTenantIds: loadedEnv['fineractPlatformTenantIds'] || 'default',
   // For connecting to others servers running elsewhere update the base API URL
-  baseApiUrls:
-    loadedEnv['fineractApiUrls'] || 'https://demo.mifos.community,https://localhost:8443,' + window.location.origin,
+  baseApiUrls: loadedEnv['fineractApiUrls'] || 'https://103.175.192.233,' + window.location.origin,
   // For connecting to server running elsewhere set the base API URL
   baseApiUrl:
     loadedEnv['fineractApiUrl'] ||
-    (loadedEnv['fineractApiUrls']?.length > 0 ? loadedEnv['fineractApiUrls'].split(',')[0] : window.location.origin),
+    (loadedEnv['fineractApiUrls']?.length > 0 ? loadedEnv['fineractApiUrls'].split(',')[0] : 'https://103.175.192.233'),
   oauthServerUrl: loadedEnv['oauthServerUrl'] ?? (base && provider ? `${base}${provider}` : ''),
   allowServerSwitch: loadedEnv.allowServerSwitch || 'true',
   apiProvider: loadedEnv['apiProvider'] || '/fineract-provider/api',
@@ -68,8 +67,8 @@ export const environment = {
   displayTenantSelector: loadedEnv['displayTenantSelector'] || 'true',
   /** Production mode - when true, shows minimal hero with only branding at bottom */
   productionMode: loadedEnv['productionMode'] === 'true' || loadedEnv['productionMode'] === true || false,
-  tenantLogoUrl: loadedEnv['tenantLogoUrl'] || 'assets/images/default_home.png',
-  tenantLogoUrlDark: loadedEnv['tenantLogoUrlDark'] || 'assets/images/white-mifos.png',
+  tenantLogoUrl: loadedEnv['tenantLogoUrl'] || 'assets/images/debug-bg.png',
+  tenantLogoUrlDark: loadedEnv['tenantLogoUrlDark'] || 'assets/images/debug-bg.png',
   documentationBaseUrl: loadedEnv['documentationBaseUrl'] || 'https://mifosforge.jira.com/wiki',
   // Time in seconds, default 60 seconds
   waitTimeForNotifications: loadedEnv['waitTimeForNotifications'] || 60,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index ca5335f5ad..3bb6a215bb 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -28,12 +28,11 @@ export const environment = {
   fineractPlatformTenantId: loadedEnv.fineractPlatformTenantId || 'default',
   fineractPlatformTenantIds: loadedEnv.fineractPlatformTenantIds || 'default',
   // For connecting to others servers running elsewhere update the base API URL
-  baseApiUrls:
-    loadedEnv.fineractApiUrls || 'https://demo.mifos.community,https://localhost:8443,' + window.location.origin,
+  baseApiUrls: loadedEnv.fineractApiUrls || 'https://103.175.192.233,' + window.location.origin,
   // For connecting to server running elsewhere set the base API URL
   baseApiUrl:
     loadedEnv.fineractApiUrl ||
-    (loadedEnv.fineractApiUrls?.length > 0 ? loadedEnv.fineractApiUrls.split(',')[0] : window.location.origin),
+    (loadedEnv.fineractApiUrls?.length > 0 ? loadedEnv.fineractApiUrls.split(',')[0] : 'https://103.175.192.233'),
   allowServerSwitch: loadedEnv.allowServerSwitch || 'true',
   apiProvider: loadedEnv.apiProvider || '/fineract-provider/api',
   apiVersion: loadedEnv.apiVersion || '/v1',
@@ -70,8 +69,8 @@ export const environment = {
   displayTenantSelector: loadedEnv.displayTenantSelector || 'true',
   /** Production mode - when true, shows minimal hero with only branding at bottom */
   productionMode: loadedEnv.productionMode === 'true' || loadedEnv.productionMode === true || false,
-  tenantLogoUrl: loadedEnv.tenantLogoUrl || 'assets/images/default_home.png',
-  tenantLogoUrlDark: loadedEnv.tenantLogoUrlDark || 'assets/images/white-mifos.png',
+  tenantLogoUrl: loadedEnv.tenantLogoUrl || 'assets/images/debug-bg.png',
+  tenantLogoUrlDark: loadedEnv.tenantLogoUrlDark || 'assets/images/debug-bg.png',
   documentationBaseUrl: loadedEnv.documentationBaseUrl || 'https://mifosforge.jira.com/wiki',
   // Time in seconds, default 60 seconds
   waitTimeForNotifications: loadedEnv.waitTimeForNotifications || 60,
diff --git a/src/favicon.ico b/src/favicon.ico
index a9b5bc492a..ecc4cbbfc7 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ
diff --git a/src/index.html b/src/index.html
index c9d9182df7..2913908bd3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,14 +11,14 @@
 <html lang="en" class="h-full bg-gray-100">
   <head>
     <meta charset="utf-8" />
-    <title>{{'APP_NAME' | translate}}</title>
+    <title>CoIMS</title>
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="mobile-web-app-capable" content="yes" />
 
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link rel="icon" type="image/png" href="assets/images/MifosX_logo.png" sizes="182x184" />
+    <link rel="icon" type="image/png" href="assets/images/debug-bg.png" sizes="182x184" />
     <link rel="apple-touch-icon" type="image/png" href="apple-touch-icon.png" sizes="182x184" />
     <link rel="manifest" href="manifest.json" />
 
@@ -104,18 +104,112 @@
       });
     </script>
 
-    <script src="https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js"></script>
     <mifosx-web-app>
       <div class="loader-wrapper">
-        <lottie-player
-          class="lottie-spinner"
-          src="assets/loading_animation.json"
-          background="transparent"
-          speed="1"
-          loop
-          autoplay
-        ></lottie-player>
+        <div class="loader-spinner">
+          <div class="spinner-ring"></div>
+          <div class="spinner-ring spinner-ring-2"></div>
+          <div class="spinner-dot"></div>
+        </div>
+        <div class="loader-text">CoIMS</div>
+        <div class="loader-subtext">Loading your workspace&hellip;</div>
+        <div class="loader-bar"><div class="loader-bar-fill"></div></div>
       </div>
+      <style>
+        .loader-wrapper {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          min-height: 100vh;
+          background: #f8fafc;
+          gap: 1.25rem;
+          font-family: 'Roboto', sans-serif;
+        }
+        .loader-spinner {
+          position: relative;
+          width: 72px;
+          height: 72px;
+        }
+        .spinner-ring {
+          position: absolute;
+          inset: 0;
+          border: 3.5px solid #e2e8f0;
+          border-top-color: #1074b9;
+          border-radius: 50%;
+          animation: spin 1s cubic-bezier(0.45, 0.05, 0.55, 0.95) infinite;
+        }
+        .spinner-ring-2 {
+          inset: 8px;
+          border-color: #e2e8f0;
+          border-top-color: #0a5a8f;
+          animation-duration: 1.5s;
+          animation-direction: reverse;
+        }
+        .spinner-dot {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          width: 10px;
+          height: 10px;
+          margin: -5px 0 0 -5px;
+          background: #1074b9;
+          border-radius: 50%;
+          animation: pulse-dot 1.2s ease-in-out infinite;
+        }
+        .loader-text {
+          font-size: 1.5rem;
+          font-weight: 700;
+          color: #1074b9;
+          letter-spacing: 0.06em;
+        }
+        .loader-subtext {
+          font-size: 0.85rem;
+          color: #94a3b8;
+          margin-top: -0.5rem;
+        }
+        .loader-bar {
+          width: 160px;
+          height: 3px;
+          background: #e2e8f0;
+          border-radius: 3px;
+          overflow: hidden;
+        }
+        .loader-bar-fill {
+          width: 40%;
+          height: 100%;
+          background: linear-gradient(90deg, #1074b9, #0a5a8f);
+          border-radius: 3px;
+          animation: bar-slide 1.4s ease-in-out infinite;
+        }
+        @keyframes spin {
+          to {
+            transform: rotate(360deg);
+          }
+        }
+        @keyframes pulse-dot {
+          0%,
+          100% {
+            transform: scale(1);
+            opacity: 1;
+          }
+          50% {
+            transform: scale(0.6);
+            opacity: 0.5;
+          }
+        }
+        @keyframes bar-slide {
+          0% {
+            transform: translateX(-100%);
+          }
+          50% {
+            transform: translateX(200%);
+          }
+          100% {
+            transform: translateX(-100%);
+          }
+        }
+      </style>
     </mifosx-web-app>
   </body>
 </html>
diff --git a/src/theme/_dark_content.scss b/src/theme/_dark_content.scss
index d3351b4243..680ef39b50 100644
--- a/src/theme/_dark_content.scss
+++ b/src/theme/_dark_content.scss
@@ -21,7 +21,7 @@
         max-width: 20rem;
         padding: 0;
         margin: 0;
-        content: url('../assets/images/white-mifos.png');
+        content: url('../assets/images/debug-bg.png');
       }
 
       .logo-section {
@@ -281,7 +281,7 @@ body.dark-theme {
   mifosx-home {
     [src*='mifos_lg-logo.jpg'],
     [src$='_home.png'] {
-      content: url('../assets/images/white-mifos.png');
+      content: url('../assets/images/debug-bg.png');
     }
   }