diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html
index e63c25adf..472ece4d2 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html
@@ -28,6 +28,7 @@
   </div>
   <div class="mat-select-arrow-wrapper"><div class="mat-select-arrow"></div></div>
 </div>
+<div class="underline"></div>
 <span class="assistiveText">{{assistiveText}}</span>
 
 <ng-template
diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts
index c8196ac90..3f9de99e2 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts
@@ -1299,7 +1299,9 @@ export abstract class _MatSelectBase<C>
   getDynamicStyle() {
     return css`
       .mat-select-arrow-wrapper {
-        ${this.panelOpen ? "transform: rotate(180deg)" : "transform: rotate(0deg)"};
+        ${this.panelOpen
+          ? "transform: rotate(180deg)"
+          : "transform: rotate(0deg)"};
       }
       ${this.utils.getMargins(this.margin)}
       &.mat-select {
@@ -1308,12 +1310,6 @@ export abstract class _MatSelectBase<C>
       height: 66.5px;
       position: relative;
 
-      .assistiveText {
-        font-size: 12px;
-        font-family: var(--fontFamily);
-        color: ${this.invalid ? "var(--select-error)" : "var(--select-color)"};
-      }
-
       .selectLabel {
         position: absolute;
         width: calc(100% - 24px);
@@ -1356,20 +1352,47 @@ export abstract class _MatSelectBase<C>
         border-top-width: 0.84375em;
         border-top-style: solid;
         border-top-color: transparent;
-        border-bottom: 1px solid var(--select-color);
         :focus {
           outline: -webkit-focus-ring-color auto 1px;
           outline-color: var(--select-focusColor);
         }
       }
 
+      .underline {
+        height: ${this.value ? "1.2px" : "1px"};
+        background-color: var(--select-color);
+        position: absolute;
+        bottom: ${this.value ? "19.5px" : "18.5px"};
+        width: 100%;
+      }
+
+      .assistiveText {
+        font-size: 12px;
+        font-family: var(--fontFamily);
+        color: ${this.invalid ? "var(--select-error)" : "var(--select-color)"};
+
+        position: absolute;
+        width: 100%;
+        bottom: -3px;
+        left: 0px;
+        margin-top: 6px;
+      }
+
       ${this.disabled
         ? `cursor: not-allowed;
       .mat-select-trigger {
         cursor: not-allowed;
-        border-bottom: 1px solid var(--select-disabledColor) !important;
         outline: none !important;
       }
+
+      .underline {
+        height: 1px;
+        background-color: var(--select-disabledColor);
+        position: absolute;
+        bottom: ${this.value ? "19.5px" : "18.5px"};
+        width: 100%;
+      }
+
       .assistiveText {
         color: var(--select-disabledColor) !important;
       }
diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts
index 06547ec49..488bf327a 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts
@@ -380,6 +380,8 @@ export class DxcTextInputComponent
       }
       .onClickIconElement {
         cursor: pointer !important;
+        height: 20px;
+        width: 20px;
         .containerIcon {
           &:focus {
             outline: -webkit-focus-ring-color auto 1px !important;
@@ -441,6 +443,8 @@ export class DxcTextInputComponent
           }
           .mat-form-field-underline {
             background-color: var(--inputText-disabledFontColor) !important;
+            bottom: unset;
+            transform: none;
           }
           .mat-form-field-empty mat-label {
             color: var(--inputText-disabledFontColor);
@@ -474,6 +478,8 @@ export class DxcTextInputComponent
               color: var(--inputText-fontColor);
             }
             .mat-form-field-underline {
+              bottom: unset;
+              transform: none;
               background-color: var(--inputText-fontColor) !important;
               .mat-form-field-ripple {
                 background-color: var(--inputText-fontColor) !important;
@@ -528,6 +534,8 @@ export class DxcTextInputComponent
         height: 0px !important;
       }
       .mat-form-field-underline {
+        bottom: unset;
+        transform: none;
         background-color: var(--inputText-fontColor) !important;
         &:focus {
           outline: -webkit-focus-ring-color auto 1px;