diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e53d4dbb..cc03ee417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Migrated various components from `NgClass` to class bindings
 - Refreshed the cryptocurrencies list
+- Improved the language localization for Spanish (`es`)
 - Cleaned up the _Webpack Bundle Analyzer_ setup
 - Upgraded `@internationalized/number` from version `3.6.5` to `3.6.6`
 - Upgraded `@ionic/angular` from version `8.8.1` to `8.8.5`
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
index dbdaf0c69..7c1906ee5 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -434,11 +434,10 @@
                 mat-stroked-button
                 (click)="onCloseHolding()"
               >
-                <ion-icon
-                  class="mr-1"
-                  name="arrow-down-circle-outline"
-                ></ion-icon
-                ><span i18n>Close Holding</span>
+                <ion-icon class="mr-1" name="arrow-down-circle-outline" /><span
+                  i18n
+                  >Close Holding</span
+                >
               </button>
             }
             @if (
diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf
index 62befb2ae..69aefb793 100644
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@@ -1612,7 +1612,7 @@
       </trans-unit>
       <trans-unit id="7410432243549869948" datatype="html">
         <source>Duration</source>
-        <target state="new">Duration</target>
+        <target state="translated">Duración</target>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.html</context>
           <context context-type="linenumber">172</context>
@@ -2760,7 +2760,7 @@
       </trans-unit>
       <trans-unit id="8186013988289067040" datatype="html">
         <source>Code</source>
-        <target state="new">Code</target>
+        <target state="translated">Código</target>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.html</context>
           <context context-type="linenumber">159</context>
@@ -3756,7 +3756,7 @@
       </trans-unit>
       <trans-unit id="5515771028435710194" datatype="html">
         <source>Loan</source>
-        <target state="new">Loan</target>
+        <target state="translated">Préstamo</target>
         <context-group purpose="location">
           <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
           <context context-type="linenumber">59</context>
@@ -5012,7 +5012,7 @@
       </trans-unit>
       <trans-unit id="3515552433025974482" datatype="html">
         <source>saying no to spreadsheets in <x id="INTERPOLATION" equiv-text="{{ currentYear }}"/></source>
-        <target state="translated">diciendo no a las hojas de cálculo en <x id="INTERPOLATION" equiv-text="{{ currentYear }}"/></target>
+        <target state="translated">en contra de las las hojas de cálculo en <x id="INTERPOLATION" equiv-text="{{ currentYear }}"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/pages/landing/landing-page.html</context>
           <context context-type="linenumber">209</context>
@@ -6959,7 +6959,7 @@
       </trans-unit>
       <trans-unit id="8466521722895614996" datatype="html">
         <source><x id="PH" equiv-text="codeToCopy"/> has been copied to the clipboard</source>
-        <target state="new"><x id="PH" equiv-text="codeToCopy"/> has been copied to the clipboard</target>
+        <target state="translated"><x id="PH" equiv-text="codeToCopy"/> ha sido copiado al portapapeles</target>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/components/admin-overview/admin-overview.component.ts</context>
           <context context-type="linenumber">377</context>
diff --git a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html
index 93fd8d97f..065e62de1 100644
--- a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html
+++ b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html
@@ -6,14 +6,16 @@
         @for (day of days; track day) {
           <div
             class="day"
-            [class]="{
-              'cursor-pointer valid': isDateOfInterest(
-                `${itemByMonth.key}-${formatDay(day)}`
-              ),
-              available:
-                marketDataByMonth[itemByMonth.key][formatDay(day)]?.marketPrice,
-              today: isToday(`${itemByMonth.key}-${formatDay(day)}`)
-            }"
+            [class.available]="
+              marketDataByMonth[itemByMonth.key][formatDay(day)]?.marketPrice
+            "
+            [class.cursor-pointer]="
+              isDateOfInterest(`${itemByMonth.key}-${formatDay(day)}`)
+            "
+            [class.today]="isToday(`${itemByMonth.key}-${formatDay(day)}`)"
+            [class.valid]="
+              isDateOfInterest(`${itemByMonth.key}-${formatDay(day)}`)
+            "
             [title]="
               (`${itemByMonth.key}-${formatDay(day)}`
                 | date: defaultDateFormat()) ?? ''
diff --git a/libs/ui/src/lib/value/value.component.html b/libs/ui/src/lib/value/value.component.html
index 57949fbe2..d5476f42d 100644
--- a/libs/ui/src/lib/value/value.component.html
+++ b/libs/ui/src/lib/value/value.component.html
@@ -40,10 +40,9 @@
         }
         <div
           class="mb-0 value"
-          [class]="{
-            'font-weight-bold h2': size === 'large',
-            h4: size === 'medium'
-          }"
+          [class.font-weight-bold]="size === 'large'"
+          [class.h2]="size === 'large'"
+          [class.h4]="size === 'medium'"
         >
           @if (value === null) {
             <span class="text-monospace text-muted">*****</span>
@@ -60,10 +59,9 @@
       @if (isString) {
         <div
           class="mb-0 text-truncate value"
-          [class]="{
-            'font-weight-bold h2': size === 'large',
-            h4: size === 'medium'
-          }"
+          [class.font-weight-bold]="size === 'large'"
+          [class.h2]="size === 'large'"
+          [class.h4]="size === 'medium'"
         >
           {{ formattedValue }}
         </div>