diff --git a/packages/ods/src/components/input/package.json b/packages/ods/src/components/input/package.json
index 422efb6b42..b425a2e9a7 100644
--- a/packages/ods/src/components/input/package.json
+++ b/packages/ods/src/components/input/package.json
@@ -9,7 +9,7 @@
     "clean": "rimraf .stencil coverage dist docs-api www",
     "doc": "typedoc --pretty --plugin ../../../scripts/typedoc-plugin-decorator.js && node ../../../scripts/generate-typedoc-md.js",
     "lint:scss": "stylelint 'src/components/**/*.scss'",
-    "lint:ts": "eslint 'src/**/*.{js,ts,tsx}'",
+    "lint:ts": "eslint '{src,tests}/**/*.{js,ts,tsx}'",
     "start": "stencil build --dev --watch --serve",
     "test:e2e": "stencil test --e2e --config stencil.config.ts",
     "test:e2e:ci": "tsc --noEmit && stencil test --e2e --ci --config stencil.config.ts",
diff --git a/packages/ods/src/components/input/src/components/ods-input/ods-input.scss b/packages/ods/src/components/input/src/components/ods-input/ods-input.scss
index fe75181775..82460399ca 100644
--- a/packages/ods/src/components/input/src/components/ods-input/ods-input.scss
+++ b/packages/ods/src/components/input/src/components/ods-input/ods-input.scss
@@ -6,12 +6,14 @@
   position: relative;
 }
 
+$ods-input__button-right: 4px;
+
 .ods-input {
   &__button {
     display: inline-flex;
     position: absolute;
     top: 0;
-    right: 4px;
+    right: $ods-input__button-right;
     border: none;
     background: none;
     color: theme.$ods-color-primary-500;
@@ -41,7 +43,7 @@
     }
 
     &--disabled {
-      background: theme.$ods-color-neutral-100;
+      background-color: theme.$ods-color-neutral-100;
       cursor: not-allowed;
       user-select: none;
 
@@ -58,12 +60,12 @@
   &__spinner {
     position: absolute;
     top: 0;
-    right: 4px;
+    right: $ods-input__button-right;
     padding: 0 4px;
 
     &::part(spinner) {
-      width: 16px;
-      height: 16px;
+      width: 1rem;
+      height: 1rem;
     }
   }
 }
diff --git a/packages/ods/src/components/input/src/components/ods-input/ods-input.tsx b/packages/ods/src/components/input/src/components/ods-input/ods-input.tsx
index fec910c7a2..494c70901c 100644
--- a/packages/ods/src/components/input/src/components/ods-input/ods-input.tsx
+++ b/packages/ods/src/components/input/src/components/ods-input/ods-input.tsx
@@ -1,7 +1,7 @@
 import { AttachInternals, Component, Element, Event, type EventEmitter, type FunctionalComponent, Host, Method, Prop, State, Watch, h } from '@stencil/core';
 import { ODS_ICON_NAME } from '../../../../icon/src';
 import { ODS_INPUT_TYPE, type OdsInputType } from '../../constants/input-type';
-import { handleKeySpace, isPassword } from '../../controller/ods-input';
+import { handleKeySpace, isPassword, setFormValue } from '../../controller/ods-input';
 import { type OdsInputEventValueChange } from '../../interfaces/events';
 
 @Component({
@@ -24,12 +24,12 @@ export class OdsInput {
   @Prop({ reflect: true }) public ariaLabelledby?: string;
   @Prop({ reflect: true }) public defaultValue?: string | number;
   @Prop({ reflect: true }) public hasError: boolean = false;
-  @Prop({ reflect: true }) public isClearable?: boolean;
+  @Prop({ reflect: true }) public isClearable?: boolean = false;
   @Prop({ reflect: true }) public isDisabled: boolean = false;
-  @Prop({ reflect: true }) public isLoading?: boolean;
+  @Prop({ reflect: true }) public isLoading?: boolean = false;
   @Prop({ mutable: true, reflect: true }) public isMasked?: boolean;
-  @Prop({ reflect: true }) public isReadonly?: boolean;
-  @Prop({ reflect: true }) public isRequired?: boolean;
+  @Prop({ reflect: true }) public isReadonly?: boolean = false;
+  @Prop({ reflect: true }) public isRequired?: boolean = false;
   @Prop({ reflect: true }) public max?: number;
   @Prop({ reflect: true }) public maxlength?: number;
   @Prop({ reflect: true }) public min?: number;
@@ -94,7 +94,7 @@ export class OdsInput {
 
   @Watch('value')
   onValueChange(value: string | number, oldValue?: string | number): void {
-    this.internals?.setFormValue?.(this.value?.toString() ?? '');
+    setFormValue(this.internals, this.value);
     this.onErrorChange();
     this.odsValueChange.emit({
       name: this.name,
@@ -109,7 +109,7 @@ export class OdsInput {
     if (!this.value) {
       this.value = this.defaultValue;
     }
-    this.internals?.setFormValue?.(this.value?.toString() ?? '');
+    setFormValue(this.internals, this.value);
   }
 
   async formResetCallback(): Promise<void> {
@@ -129,7 +129,7 @@ export class OdsInput {
       <button
         class="ods-input__button"
         disabled= { this.isDisabled }
-        onClick={ (): Promise<void> => callback() }
+        onClick={ callback }
         onKeyUp={ (event: KeyboardEvent): Promise<void> => handleKeySpace(event, this.isDisabled, callback) }>
         <ods-icon name={ icon }>
         </ods-icon>
diff --git a/packages/ods/src/components/input/src/controller/ods-input.ts b/packages/ods/src/components/input/src/controller/ods-input.ts
index b0047fc97b..58f56d96f4 100644
--- a/packages/ods/src/components/input/src/controller/ods-input.ts
+++ b/packages/ods/src/components/input/src/controller/ods-input.ts
@@ -1,54 +1,20 @@
-// import { EventEmitter } from "@stencil/core";
-
-// function handleClear(eventEmitter: EventEmitter<void>, isDisabled: boolean): undefined | void {
-//   if (isDisabled) {
-//     return;
-//   }
-//   eventEmitter.emit();
-//   return undefined;
-// }
-
 async function handleKeySpace(event: KeyboardEvent, isDisabled: boolean, callback: () => Promise<void>): Promise<void> {
-  event?.preventDefault?.();
+  event.preventDefault();
   if(event.key === ' ' && !isDisabled) {
     await callback();
   }
 }
 
-// function handleOnInput(eventEmitter: EventEmitter<{ value?: string | number}>, isDisabled: boolean, internals: ElementInternals, inputEl?: HTMLInputElement): { value?: string | number, error: boolean } {
-//   if (isDisabled) {
-//     return;
-//   }
-//   inputEl?.value && internals.setFormValue(inputEl.value.toString());
-//   eventEmitter.emit({ value: inputEl?.value });
-//   return { value: inputEl?.value, error: !inputEl?.validity.valid ?? false }
-// }
-
-// function handleReset(eventEmitter: EventEmitter<void>, isDisabled: boolean, defaultValue?: string | number): string | number | undefined {
-//   if (isDisabled) {
-//     return;
-//   }
-//   eventEmitter.emit();
-//   return defaultValue ?? undefined;
-// }
-
-// function handleToggleMask(eventEmitter: EventEmitter<void>, isDisabled: boolean, masked?: boolean): boolean {
-//   if (isDisabled) {
-//     return;
-//   }
-//   eventEmitter.emit();
-//   return !masked;
-// }
+function setFormValue(internals: ElementInternals, value?: number | string): void {
+  internals?.setFormValue?.(value?.toString() ?? '');
+}
 
 function isPassword(isMasked?: boolean): boolean {
   return isMasked !== undefined;
 }
 
 export {
-  // handleClear,
   handleKeySpace,
-  // handleOnInput,
-  // handleToggleMask,
-  // handleReset,
   isPassword,
+  setFormValue,
 };
diff --git a/packages/ods/src/components/input/tests/behaviour/ods-input.e2e.ts b/packages/ods/src/components/input/tests/behaviour/ods-input.e2e.ts
new file mode 100644
index 0000000000..8204c432a3
--- /dev/null
+++ b/packages/ods/src/components/input/tests/behaviour/ods-input.e2e.ts
@@ -0,0 +1,114 @@
+import type { E2EElement, E2EPage } from '@stencil/core/testing';
+import { newE2EPage } from '@stencil/core/testing';
+
+describe('ods-input accessibility', () => {
+  let el: E2EElement;
+  let page: E2EPage;
+  let part: E2EElement;
+
+  async function setup(content: string): Promise<void> {
+    page = await newE2EPage();
+
+    await page.setContent(content);
+    await page.evaluate(() => document.body.style.setProperty('margin', '0px'));
+
+    el = await page.find('ods-input');
+    part = await page.find('ods-input >>> [part="input"]');
+    await page.waitForChanges();
+  }
+
+  beforeEach(jest.clearAllMocks);
+
+  describe('method:clear', () => {
+    it('should receive odsClear event', async() => {
+      await setup('<ods-input value="value"></ods-input>');
+      const odsClearSpy = await page.spyOnEvent('odsClear');
+      await el.callMethod('clear');
+      await page.waitForChanges();
+      expect(await el.getProperty('value')).toBeNull();
+      expect(odsClearSpy).toHaveReceivedEventTimes(1);
+    });
+
+    it('should do nothing because of disabled', async() => {
+      const value = 'value';
+      await setup(`<ods-input is-disabled value="${value}"></ods-input>`);
+      const odsClearSpy = await page.spyOnEvent('odsClear');
+      await el.callMethod('clear');
+      await page.waitForChanges();
+      expect(await el.getProperty('value')).toBe(value);
+      expect(odsClearSpy).not.toHaveReceivedEvent();
+    });
+  });
+
+  describe('method:reset', () => {
+    it('should receive odsReset event', async() => {
+      const defaultValue = 'defaultValue';
+      await setup(`<ods-input value="value" default-value="${defaultValue}"></ods-input>`);
+      const odsResetSpy = await page.spyOnEvent('odsReset');
+      await el.callMethod('reset');
+      await page.waitForChanges();
+      expect(await el.getProperty('value')).toBe(defaultValue);
+      expect(odsResetSpy).toHaveReceivedEventTimes(1);
+    });
+
+    it('should do nothing because of disabled', async() => {
+      const value = 'value';
+      await setup(`<ods-input is-disabled value="${value}" default-value="defaultValue"></ods-input>`);
+      const odsResetSpy = await page.spyOnEvent('odsReset');
+      await el.callMethod('reset');
+      await page.waitForChanges();
+      expect(await el.getProperty('value')).toBe(value);
+      expect(odsResetSpy).not.toHaveReceivedEvent();
+    });
+  });
+
+  describe('method:toggleMask', () => {
+    it('should toggle mask', async() => {
+      await setup('<ods-input is-masked></ods-input>');
+      const odsToggleMaskSpy = await page.spyOnEvent('odsToggleMask');
+      await el.callMethod('toggleMask');
+      await page.waitForChanges();
+      expect(await el.getProperty('isMasked')).toBe(false);
+
+      await el.callMethod('toggleMask');
+      await page.waitForChanges();
+      expect(await el.getProperty('isMasked')).toBe(true);
+      expect(odsToggleMaskSpy).toHaveReceivedEventTimes(2);
+    });
+
+    it('should do nothing because of disabled', async() => {
+      await setup('<ods-input is-masked is-disabled></ods-input>');
+      const odsToggleMaskSpy = await page.spyOnEvent('odsToggleMask');
+      await el.callMethod('toggleMask');
+      await page.waitForChanges();
+
+      expect(await el.getProperty('isMasked')).toBe(true);
+      expect(odsToggleMaskSpy).not.toHaveReceivedEvent();
+    });
+  });
+
+  describe('event:odsValueChange', () => {
+    it('should receive odsValueChange event', async() => {
+      const typeValue = 'some text';
+      await setup('<ods-input></ods-input>');
+      const odsValueChangeSpy = await page.spyOnEvent('odsValueChange');
+
+      await part.type(typeValue);
+      await page.waitForChanges();
+
+      expect(await el.getProperty('value')).toBe(typeValue);
+      expect(odsValueChangeSpy).toHaveReceivedEventTimes(typeValue.length);
+    });
+
+    it('should do nothing because of disabled', async() => {
+      await setup('<ods-input is-disabled></ods-input>');
+      const odsValueChangeSpy = await page.spyOnEvent('odsValueChange');
+
+      await part.type('some text');
+      await page.waitForChanges();
+
+      expect(await el.getProperty('value')).toBe(undefined);
+      expect(odsValueChangeSpy).not.toHaveReceivedEvent();
+    });
+  });
+});
diff --git a/packages/ods/src/components/input/tests/controller/ods-input.spec.ts b/packages/ods/src/components/input/tests/controller/ods-input.spec.ts
index 69c76c6bda..9f1abae019 100644
--- a/packages/ods/src/components/input/tests/controller/ods-input.spec.ts
+++ b/packages/ods/src/components/input/tests/controller/ods-input.spec.ts
@@ -17,8 +17,9 @@ describe('ods-input controller', () => {
       const callback = jest.fn();
       const event = {
         key: ' ',
+        preventDefault: jest.fn(),
       } as unknown as KeyboardEvent;
-      handleKeySpace(event, true, callback)
+      handleKeySpace(event, true, callback);
       expect(callback).not.toHaveBeenCalled();
     });
 
@@ -26,8 +27,9 @@ describe('ods-input controller', () => {
       const callback = jest.fn();
       const event = {
         key: ' ',
+        preventDefault: jest.fn(),
       } as unknown as KeyboardEvent;
-      handleKeySpace(event, false, callback)
+      handleKeySpace(event, false, callback);
       expect(callback).toHaveBeenCalledTimes(1);
     });
 
@@ -35,8 +37,9 @@ describe('ods-input controller', () => {
       const callback = jest.fn();
       const event = {
         key: 'Enter',
+        preventDefault: jest.fn(),
       } as unknown as KeyboardEvent;
-      handleKeySpace(event, false, callback)
+      handleKeySpace(event, false, callback);
       expect(callback).not.toHaveBeenCalled();
     });
   });
diff --git a/packages/ods/src/components/input/tests/navigation/ods-input.e2e2.ts b/packages/ods/src/components/input/tests/navigation/ods-input.e2e.ts
similarity index 96%
rename from packages/ods/src/components/input/tests/navigation/ods-input.e2e2.ts
rename to packages/ods/src/components/input/tests/navigation/ods-input.e2e.ts
index 5c79bbd330..9d079c8990 100644
--- a/packages/ods/src/components/input/tests/navigation/ods-input.e2e2.ts
+++ b/packages/ods/src/components/input/tests/navigation/ods-input.e2e.ts
@@ -28,7 +28,7 @@ describe('ods-input accessibility', () => {
 
     el = await page.find('ods-input');
     input = await page.find('ods-input >>> input');
-    button = await page.find('ods-input >>> .ods-input__button')
+    button = await page.find('ods-input >>> .ods-input__button');
   }
 
   beforeEach(jest.clearAllMocks);
@@ -94,7 +94,7 @@ describe('ods-input accessibility', () => {
       const odsClearSpy = await page.spyOnEvent('odsClear');
       expect(await el.getProperty('value')).toBe('value');
 
-      await button.click()
+      await button.click();
       await page.waitForChanges();
 
       expect(await el.getProperty('value')).toBeNull();
@@ -109,11 +109,14 @@ describe('ods-input accessibility', () => {
       await page.keyboard.press('Tab');
       await page.keyboard.press('Space');
       await page.waitForChanges();
-
       expect(await el.getProperty('value')).toBe('value');
+
       await page.keyboard.press('Enter');
       await page.waitForChanges();
+      expect(await el.getProperty('value')).toBe('value');
+
       await button.click();
+      await page.waitForChanges();
       expect(await el.getProperty('value')).toBe('value');
       expect(odsClearSpy).not.toHaveReceivedEvent();
     });
@@ -154,7 +157,7 @@ describe('ods-input accessibility', () => {
 
       await page.keyboard.press('Tab');
       await page.keyboard.press('Tab');
-      await page.keyboard.press(' ');
+      await page.keyboard.press('Space');
       await page.waitForChanges();
 
       expect(await input.getProperty('type')).toBe('text');
@@ -166,7 +169,7 @@ describe('ods-input accessibility', () => {
       const odsToggleMaskSpy = await page.spyOnEvent('odsToggleMask');
       expect(await input.getProperty('type')).toBe('password');
 
-      await button.click()
+      await button.click();
       await page.waitForChanges();
 
       expect(await input.getProperty('type')).toBe('text');
@@ -182,13 +185,14 @@ describe('ods-input accessibility', () => {
       await page.keyboard.press('Tab');
       await page.keyboard.press('Space');
       await page.waitForChanges();
-
       expect(await input.getProperty('type')).toBe('password');
 
       await page.keyboard.press('Enter');
       await page.waitForChanges();
-      await button.click();
+      expect(await input.getProperty('type')).toBe('password');
 
+      await button.click();
+      await page.waitForChanges();
       expect(await input.getProperty('type')).toBe('password');
       expect(odsToggleMaskSpy).not.toHaveReceivedEvent();
     });
diff --git a/packages/ods/src/components/input/tests/rendering/ods-input.e2e.ts b/packages/ods/src/components/input/tests/rendering/ods-input.e2e.ts
index 4011350859..1bdd0a32b0 100644
--- a/packages/ods/src/components/input/tests/rendering/ods-input.e2e.ts
+++ b/packages/ods/src/components/input/tests/rendering/ods-input.e2e.ts
@@ -16,7 +16,6 @@ describe('ods-input rendering', () => {
       await page.addStyleTag({ content: customStyle });
     }
 
-
     el = await page.find('ods-input');
     part = await page.find('ods-input >>> [part="input"]');
     await page.waitForChanges();
@@ -36,99 +35,6 @@ describe('ods-input rendering', () => {
     });
   });
 
-  describe('method:clear', () => {
-    it('should receive odsClear event', async() => {
-      await setup('<ods-input value="value"></ods-input>');
-      const odsClearSpy = await page.spyOnEvent('odsClear');
-      await el.callMethod('clear');
-      await page.waitForChanges();
-      expect(await el.getProperty('value')).toBeNull();
-      expect(odsClearSpy).toHaveReceivedEventTimes(1);
-    });
-
-    it('should do nothing because of disabled', async() => {
-      const value = 'value';
-      await setup(`<ods-input is-disabled value="${value}"></ods-input>`);
-      const odsClearSpy = await page.spyOnEvent('odsClear');
-      await el.callMethod('clear');
-      await page.waitForChanges();
-      expect(await el.getProperty('value')).toBe(value);
-      expect(odsClearSpy).not.toHaveReceivedEvent();
-    });
-  });
-
-  describe('method:reset', () => {
-    it('should receive odsReset event', async() => {
-      const defaultValue = 'defaultValue';
-      await setup(`<ods-input value="value" default-value="${defaultValue}"></ods-input>`);
-      const odsResetSpy = await page.spyOnEvent('odsReset');
-      await el.callMethod('reset');
-      await page.waitForChanges();
-      expect(await el.getProperty('value')).toBe(defaultValue);
-      expect(odsResetSpy).toHaveReceivedEventTimes(1);
-    });
-
-    it('should do nothing because of disabled', async() => {
-      const value = 'value';
-      await setup(`<ods-input is-disabled value="${value}" default-value="defaultValue"></ods-input>`);
-      const odsResetSpy = await page.spyOnEvent('odsReset');
-      await el.callMethod('reset');
-      await page.waitForChanges();
-      expect(await el.getProperty('value')).toBe(value);
-      expect(odsResetSpy).not.toHaveReceivedEvent();
-    });
-  });
-
-  describe('method:toggleMask', () => {
-    it('should toggle mask', async() => {
-      await setup(`<ods-input is-masked></ods-input>`);
-      const odsToggleMaskSpy = await page.spyOnEvent('odsToggleMask');
-      await el.callMethod('toggleMask');
-      await page.waitForChanges();
-      expect(await el.getProperty('isMasked')).toBe(false);
-
-      await el.callMethod('toggleMask');
-      await page.waitForChanges();
-      expect(await el.getProperty('isMasked')).toBe(true);
-      expect(odsToggleMaskSpy).toHaveReceivedEventTimes(2);
-    });
-
-    it('should do nothing because of disabled', async() => {
-      await setup(`<ods-input is-masked is-disabled></ods-input>`);
-      const odsToggleMaskSpy = await page.spyOnEvent('odsToggleMask');
-      await el.callMethod('toggleMask');
-      await page.waitForChanges();
-
-      expect(await el.getProperty('isMasked')).toBe(true);
-      expect(odsToggleMaskSpy).not.toHaveReceivedEvent();
-    });
-  });
-
-  describe('event:odsValueChange', () => {
-    it('should receive odsValueChange event', async() => {
-      const typeValue = 'some text';
-      await setup(`<ods-input></ods-input>`);
-      const odsValueChangeSpy = await page.spyOnEvent('odsValueChange');
-
-      await part.type(typeValue)
-      await page.waitForChanges();
-
-      expect(await el.getProperty('value')).toBe(typeValue);
-      expect(odsValueChangeSpy).toHaveReceivedEventTimes(typeValue.length);
-    });
-
-    it('should do nothing because of disabled', async() => {
-      await setup(`<ods-input is-disabled></ods-input>`);
-      const odsValueChangeSpy = await page.spyOnEvent('odsValueChange');
-
-      await part.type('some text')
-      await page.waitForChanges();
-
-      expect(await el.getProperty('value')).toBe(undefined);
-      expect(odsValueChangeSpy).not.toHaveReceivedEvent();
-    });
-  });
-
   describe('Form', () => {
     it('should get form data with button type submit', async() => {
       await setup(`<form method="get">
diff --git a/packages/ods/src/components/input/tests/rendering/ods-input.spec.ts b/packages/ods/src/components/input/tests/rendering/ods-input.spec.ts
index c94383f5a6..082d792f11 100644
--- a/packages/ods/src/components/input/tests/rendering/ods-input.spec.ts
+++ b/packages/ods/src/components/input/tests/rendering/ods-input.spec.ts
@@ -1,3 +1,4 @@
+jest.mock('../../src/controller/ods-input');
 import type { SpecPage } from '@stencil/core/testing';
 import { newSpecPage } from '@stencil/core/testing';
 import { ODS_INPUT_TYPE, OdsInput } from '../../src';
@@ -19,14 +20,14 @@ describe('ods-input rendering', () => {
 
   describe('methods', () => {
     describe('clear', () => {
-      it('should clear the input', async () => {
-        await setup(`<ods-input value="value"></ods-input>`);
+      it('should clear the input', async() => {
+        await setup('<ods-input value="value"></ods-input>');
         await rootInstance?.clear();
         await page.waitForChanges();
         expect(root?.getAttribute('value')).toBeNull();
       });
 
-      it('should do nothing with disabled', async () => {
+      it('should do nothing with disabled', async() => {
         const value = 'value';
         await setup(`<ods-input value="${value}" is-disabled></ods-input>`);
         await rootInstance?.clear();
@@ -36,7 +37,7 @@ describe('ods-input rendering', () => {
     });
 
     describe('reset', () => {
-      it('should reset input with default value', async () => {
+      it('should reset input with default value', async() => {
         const defaultValue = 'defaultValue';
         const value = 'value';
         await setup(`<ods-input value="${value}" default-value="${defaultValue}"></ods-input>`);
@@ -46,7 +47,7 @@ describe('ods-input rendering', () => {
         expect(root?.getAttribute('value')).toBe(defaultValue);
       });
 
-      it('should do nothing with disabled', async () => {
+      it('should do nothing with disabled', async() => {
         const defaultValue = 'defaultValue';
         const value = 'value';
         await setup(`<ods-input is-disabled value="${value}" default-value="${defaultValue}"></ods-input>`);
@@ -57,18 +58,17 @@ describe('ods-input rendering', () => {
       });
     });
 
-
-    describe('toogleMasked', () => {
-      it('should change masked', async () => {
-        await setup(`<ods-input is-masked></ods-input>`);
+    describe('toggleMasked', () => {
+      it('should change masked', async() => {
+        await setup('<ods-input is-masked></ods-input>');
         expect(root?.getAttribute('is-masked')).toBe('');
         await rootInstance?.toggleMask();
         await page.waitForChanges();
         expect(root?.getAttribute('is-masked')).toBeNull();
       });
 
-      it('should do nothing because of disabled', async () => {
-        await setup(`<ods-input is-masked is-disabled></ods-input>`);
+      it('should do nothing because of disabled', async() => {
+        await setup('<ods-input is-masked is-disabled></ods-input>');
         expect(root?.getAttribute('is-masked')).toBe('');
         await rootInstance?.toggleMask();
         await page.waitForChanges();
@@ -88,7 +88,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('aria-label')).toBeNull();
       });
@@ -104,7 +104,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('aria-labelledby')).toBeNull();
       });
@@ -119,7 +119,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('defaultValue')).toBeNull();
       });
@@ -127,13 +127,13 @@ describe('ods-input rendering', () => {
 
     describe('hasError', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input has-error></ods-input>`);
+        await setup('<ods-input has-error></ods-input>');
 
         expect(root?.getAttribute('has-error')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('has-error')).toBeNull();
       });
@@ -141,13 +141,13 @@ describe('ods-input rendering', () => {
 
     describe('isClearable', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input is-clearable></ods-input>`);
+        await setup('<ods-input is-clearable></ods-input>');
 
         expect(root?.getAttribute('is-clearable')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('is-clearable')).toBeNull();
       });
@@ -155,13 +155,13 @@ describe('ods-input rendering', () => {
 
     describe('isDisabled', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input is-disabled></ods-input>`);
+        await setup('<ods-input is-disabled></ods-input>');
 
         expect(root?.getAttribute('is-disabled')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('is-disabled')).toBeNull();
       });
@@ -169,13 +169,13 @@ describe('ods-input rendering', () => {
 
     describe('isMasked', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input is-masked></ods-input>`);
+        await setup('<ods-input is-masked></ods-input>');
 
         expect(root?.getAttribute('is-masked')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('is-masked')).toBeNull();
       });
@@ -183,13 +183,13 @@ describe('ods-input rendering', () => {
 
     describe('isReadonly', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input is-readonly></ods-input>`);
+        await setup('<ods-input is-readonly></ods-input>');
 
         expect(root?.getAttribute('is-readonly')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('is-readonly')).toBeNull();
       });
@@ -197,13 +197,13 @@ describe('ods-input rendering', () => {
 
     describe('isRequired', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input is-required></ods-input>`);
+        await setup('<ods-input is-required></ods-input>');
 
         expect(root?.getAttribute('is-required')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('is-required')).toBeNull();
       });
@@ -211,13 +211,13 @@ describe('ods-input rendering', () => {
 
     describe('isLoading', () => {
       it('should be reflected', async() => {
-        await setup(`<ods-input is-loading></ods-input>`);
+        await setup('<ods-input is-loading></ods-input>');
 
         expect(root?.getAttribute('is-loading')).toBe('');
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('is-loading')).toBeNull();
       });
@@ -232,7 +232,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('max')).toBeNull();
       });
@@ -247,7 +247,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('maxlength')).toBeNull();
       });
@@ -262,7 +262,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('min')).toBeNull();
       });
@@ -277,7 +277,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('minlength')).toBeNull();
       });
@@ -292,7 +292,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('name')).toBeNull();
       });
@@ -300,14 +300,14 @@ describe('ods-input rendering', () => {
 
     describe('pattern', () => {
       it('should be reflected', async() => {
-        const patternValue = "pattern";
+        const patternValue = 'pattern';
         await setup(`<ods-input pattern="${patternValue}"></ods-input>`);
 
         expect(root?.getAttribute('pattern')).toBe(patternValue);
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('pattern')).toBeNull();
       });
@@ -322,7 +322,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('placeholder')).toBeNull();
       });
@@ -337,7 +337,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('step')).toBeNull();
       });
@@ -351,8 +351,8 @@ describe('ods-input rendering', () => {
         expect(root?.getAttribute('type')).toBe(typeValue);
       });
 
-      it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+      it('should not be set by default with type "text"', async() => {
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('type')).toBe(ODS_INPUT_TYPE.text);
       });
@@ -367,7 +367,7 @@ describe('ods-input rendering', () => {
       });
 
       it('should not be set by default', async() => {
-        await setup(`<ods-input></ods-input>`);
+        await setup('<ods-input></ods-input>');
 
         expect(root?.getAttribute('value')).toBeNull();
       });
diff --git a/packages/ods/src/style/_input.scss b/packages/ods/src/style/_input.scss
index 04ad2cf988..5e97965456 100644
--- a/packages/ods/src/style/_input.scss
+++ b/packages/ods/src/style/_input.scss
@@ -9,8 +9,8 @@
   padding: 4px 8px;
   width: 100%;
   height: 32px;
-  line-height: 16px;
-  font-size: 16px;
+  line-height: 1rem;
+  font-size: 1rem;
 
   &:focus {
     @include focus.ods-focus();
diff --git a/packages/ods/vue/tests/_app/src/components/ods-input.vue b/packages/ods/vue/tests/_app/src/components/ods-input.vue
index b534203bbf..2dd17e2c74 100644
--- a/packages/ods/vue/tests/_app/src/components/ods-input.vue
+++ b/packages/ods/vue/tests/_app/src/components/ods-input.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- FIXME custom event not working in vue -->
   <ods-input name="ods-input" @ods-value-change="() => console.log('test')"></ods-input>
 
   <OdsInput name="ods-input-disabled" is-disabled @ods-value-change="onOdsValueChange" />
diff --git a/packages/storybook/stories/components/input/migration_.from.17.x.mdx b/packages/storybook/stories/components/input/migration_.from.17.x.mdx
index 7d1c0b9185..44b960e5ec 100644
--- a/packages/storybook/stories/components/input/migration_.from.17.x.mdx
+++ b/packages/storybook/stories/components/input/migration_.from.17.x.mdx
@@ -1,9 +1,9 @@
 import { Meta } from '@storybook/blocks';
-import * as SkeletonStories from './input.stories';
+import * as InputStories from './input.stories';
 
-<Meta of={SkeletonStories} name='Migration From 17.x' />
+<Meta of={InputStories} name='Migration From 17.x' />
 
-# Skeleton - migrate from v17 to v18
+# Input - migrate from v17 to v18
 ----
 
 ## Attributes changes
@@ -54,7 +54,7 @@ You can use the new `isRequired` attribute to obtain the same behavior.
 
 Has been removed.
 
-You can replace it a regax on the `pattern` attributes.
+You can replace it with a regex on the `pattern` attributes.
 
 `inline` <img src="https://img.shields.io/badge/removed-FF0000" />
 
@@ -67,13 +67,13 @@ You can add some style directly on the component if you want to override that.
 
 Has been removed.
 
-For add a label on the input wrapped it with the component `form-field`.
+To add a label on the input wrapped it with the component `form-field`.
 
 `prefix-value` <img src="https://img.shields.io/badge/removed-FF0000" />
 
 Have been removed.
 
-No need anymore. Can't be migrate.
+This feature is not supported anymore
 
 `maxlength` <img src="https://img.shields.io/badge/new-008000" />