diff --git a/resources/ts/Views/LoginPage.tsx b/resources/ts/Views/LoginPage.tsx
index 273db7335..cf540c3cc 100644
--- a/resources/ts/Views/LoginPage.tsx
+++ b/resources/ts/Views/LoginPage.tsx
@@ -83,12 +83,12 @@ export default class LoginPage extends Page {
     return collect<VnodeCollectionItem>({
       username: (
         <md-filled-text-field name="username" required label={__('Nome utente/email')}>
-          <MdIcon icon={mdiAccountOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiAccountOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       password: (
         <md-filled-text-field name="password" required label={__('Password')} type="password">
-          <MdIcon icon={mdiLockOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiLockOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       remember: (
@@ -104,7 +104,7 @@ export default class LoginPage extends Page {
     return collect<VnodeCollectionItem>({
       email: (
         <md-filled-text-field name="email" required label={__('Email')} type="email">
-          <MdIcon icon={mdiEmailOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiEmailOutline} slot="leading-icon"/>
         </md-filled-text-field>
       )
     });
diff --git a/resources/ts/Views/ResetPasswordPage.tsx b/resources/ts/Views/ResetPasswordPage.tsx
index 6d689046a..4033e95c2 100644
--- a/resources/ts/Views/ResetPasswordPage.tsx
+++ b/resources/ts/Views/ResetPasswordPage.tsx
@@ -54,12 +54,12 @@ export default class ResetPasswordPage extends Page {
       token: <input type="hidden" name="token" value={this.parameters.get('token')}/>,
       password: (
         <md-filled-text-field name="password" required label={__('Password')} type="password">
-          <MdIcon icon={mdiLockOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiLockOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       password_confirmation: (
         <md-filled-text-field name="password_confirmation" required label={__('Conferma password')} type="password">
-          <MdIcon icon={mdiLockCheckOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiLockCheckOutline} slot="leading-icon"/>
         </md-filled-text-field>
       )
     });
@@ -70,7 +70,7 @@ export default class ResetPasswordPage extends Page {
       login: (
         <md-filled-button type="submit" onclick={this.onResetPasswordButtonClicked.bind(this)}>
           {__('Reimposta password')}
-          <MdIcon icon={mdiAccountOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiAccountOutline} slot="leading-icon"/>
         </md-filled-button>
       )
     });
diff --git a/resources/ts/Views/Setup/Steps/AdminUserStep.tsx b/resources/ts/Views/Setup/Steps/AdminUserStep.tsx
index 445fc4e6f..87bc661a1 100644
--- a/resources/ts/Views/Setup/Steps/AdminUserStep.tsx
+++ b/resources/ts/Views/Setup/Steps/AdminUserStep.tsx
@@ -58,22 +58,22 @@ export default class AdminUserStep extends SetupStep<AdminUserStepAttributes> {
     return collect<VnodeCollectionItem>({
       email: (
         <md-filled-text-field name="email" label={__('Email')} required grid-span={6}>
-          <MdIcon icon={mdiEmailOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiEmailOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       username: (
         <md-filled-text-field name="username" label={__('Nome utente')} required grid-span={6}>
-          <MdIcon icon={mdiAccountOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiAccountOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       password: (
         <md-filled-text-field name="password" label={__('Password')} required type="password" minLength={8} grid-span={6}>
-          <MdIcon icon={mdiLockOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiLockOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       password_confirmation: (
         <md-filled-text-field name="passwordConfirmation" label={__('Conferma password')} required type="password" minLength={8} grid-span={6}>
-          <MdIcon icon={mdiLockCheckOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiLockCheckOutline} slot="leading-icon"/>
         </md-filled-text-field>
       )
     });
diff --git a/resources/ts/Views/Setup/Steps/DatabaseStep.tsx b/resources/ts/Views/Setup/Steps/DatabaseStep.tsx
index 7b3cce777..d19a60119 100644
--- a/resources/ts/Views/Setup/Steps/DatabaseStep.tsx
+++ b/resources/ts/Views/Setup/Steps/DatabaseStep.tsx
@@ -63,32 +63,32 @@ export default class DatabaseStep extends SetupStep {
       // TODO: Autocomplete/Select with possible drivers
       driver: (
         <md-filled-text-field name="driver" label={__('Driver')} required grid-span={4}>
-          <MdIcon icon={mdiPowerPlugOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiPowerPlugOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       host: (
         <md-filled-text-field name="host" label={__('Host')} required grid-span={4} placeholder="localhost">
-          <MdIcon icon={mdiServerNetwork} slot="leadingicon"/>
+          <MdIcon icon={mdiServerNetwork} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       username: (
         <md-filled-text-field name="username" label={__('Nome utente')} required grid-span={4} placeholder="root">
-          <MdIcon icon={mdiAccountOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiAccountOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       password: (
         <md-filled-text-field type="password" name="password" label={__('Password')} grid-span={4}>
-          <MdIcon icon={mdiFormTextboxPassword} slot="leadingicon"/>
+          <MdIcon icon={mdiFormTextboxPassword} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       database_name: (
         <md-filled-text-field name="database_name" label={__('Nome database')} required grid-span={4} placeholder="openstamanager">
-          <MdIcon icon={mdiDatabaseOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiDatabaseOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       port: (
         <md-filled-text-field name="port" label={__('Porta')} required grid-span={4} placeholder="3306">
-          <MdIcon icon={mdiServerNetwork} slot="leadingicon"/>
+          <MdIcon icon={mdiServerNetwork} slot="leading-icon"/>
         </md-filled-text-field>
       )
     });
diff --git a/resources/ts/Views/Setup/Steps/RegionalSettings.tsx b/resources/ts/Views/Setup/Steps/RegionalSettings.tsx
index e3c3a5cb1..d1bbf4edb 100644
--- a/resources/ts/Views/Setup/Steps/RegionalSettings.tsx
+++ b/resources/ts/Views/Setup/Steps/RegionalSettings.tsx
@@ -60,14 +60,14 @@ export default class RegionalSettings extends SetupStep {
         <md-filled-text-field name="long" label={__('Formato data lunga')} required supporting-text={__('Anteprima: :date', {
           date: dayjs().format(this.dateFormats.long())
         })}>
-          <MdIcon icon={mdiCalendarClockOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiCalendarClockOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       short_date_format: (
         <md-filled-text-field name="short" label={__('Formato data corta')} required supporting-text={__('Anteprima: :date', {
           date: dayjs().format(this.dateFormats.short())
         })}>
-          <MdIcon icon={mdiCalendarMonthOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiCalendarMonthOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       time_format: (
@@ -75,7 +75,7 @@ export default class RegionalSettings extends SetupStep {
           date: dayjs().format(this.dateFormats.time())
         })}
         >
-          <MdIcon icon={mdiClockOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiClockOutline} slot="leading-icon"/>
         </md-filled-text-field>
       )
     });
diff --git a/resources/ts/Views/Setup/Steps/WelcomeStep.tsx b/resources/ts/Views/Setup/Steps/WelcomeStep.tsx
index f94a64988..f4486ed56 100644
--- a/resources/ts/Views/Setup/Steps/WelcomeStep.tsx
+++ b/resources/ts/Views/Setup/Steps/WelcomeStep.tsx
@@ -51,10 +51,11 @@ export default class WelcomeStep<A extends WelcomeStepAttributes = WelcomeStepAt
           })}
         </p>
         <md-filled-select id="language-select" name="locale" label={__('Lingua')} required value={app.locale} style={{textAlign: 'initial'}} oninput={WelcomeStep.onLanguageSelected}>
-          {getFlag(app.locale, 'leadingicon')}
+          {getFlag(app.locale, 'leading-icon')}
           {vnode.attrs.languages.map((locale) => (
-            <md-select-option key={locale} value={locale} headline={capitalize(getLocaleDisplayName(locale))}>
+            <md-select-option key={locale} value={locale}>
               {getFlag(locale, 'start', {marginLeft: '16px'})}
+              <div slot="headline">{capitalize(getLocaleDisplayName(locale))}</div>
             </md-select-option>
           ))}
         </md-filled-select>
diff --git a/resources/ts/Views/Users/UsersRecordDialog.tsx b/resources/ts/Views/Users/UsersRecordDialog.tsx
index 2fa1a930c..58ea27a10 100644
--- a/resources/ts/Views/Users/UsersRecordDialog.tsx
+++ b/resources/ts/Views/Users/UsersRecordDialog.tsx
@@ -23,12 +23,12 @@ export default class UsersRecordDialog extends AddEditRecordDialog<User> {
     return collect({
       username: (
         <md-filled-text-field required label={__('Nome utente')}>
-          <MdIcon icon={mdiAccountOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiAccountOutline} slot="leading-icon"/>
         </md-filled-text-field>
       ),
       email: (
         <md-filled-text-field required type="email" label={__('Email')}>
-          <MdIcon icon={mdiEmailOutline} slot="leadingicon"/>
+          <MdIcon icon={mdiEmailOutline} slot="leading-icon"/>
         </md-filled-text-field>
       )
     });