diff --git a/package-lock.json b/package-lock.json
index fc46d3a..a078d2f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,13 +11,13 @@
             "dependencies": {
                 "@emotion/react": "^11.14.0",
                 "@emotion/styled": "^11.14.1",
-                "@gridsuite/commons-ui": "0.295.0",
+                "@gridsuite/commons-ui": "0.297.0",
                 "@hookform/resolvers": "^4.1.3",
-                "@mui/icons-material": "^7.3.11",
-                "@mui/lab": "7.0.1-beta.25",
-                "@mui/material": "^7.3.11",
-                "@mui/x-date-pickers": "^7.29.4",
-                "@mui/x-tree-view": "^8.21.0",
+                "@mui/icons-material": "^9.4.0",
+                "@mui/lab": "^9.0.0-beta.9",
+                "@mui/material": "^9.4.0",
+                "@mui/x-date-pickers": "^9.13.0",
+                "@mui/x-tree-view": "^9.13.0",
                 "@reduxjs/toolkit": "^2.9.0",
                 "ag-grid-community": "^35.3.1",
                 "ag-grid-react": "^35.3.1",
@@ -27,7 +27,7 @@
                 "react": "^19.2.0",
                 "react-dom": "^19.2.0",
                 "react-hook-form": "^7.62.0",
-                "react-hook-form-mui": "^7.6.2",
+                "react-hook-form-mui": "^9.0.1",
                 "react-intl": "^7.1.11",
                 "react-redux": "^9.2.0",
                 "react-router": "^7.8.2",
@@ -2067,14 +2067,14 @@
             }
         },
         "node_modules/@base-ui/utils": {
-            "version": "0.2.9",
-            "resolved": "https://registry.npmjs.org/@base-ui/utils/-/utils-0.2.9.tgz",
-            "integrity": "sha512-x/PDDCYzoqPpjrdyb3VcyylTI2IjUXEtYDGi5foh7KsnmNJIIaVwA2GLgDH1dps1GgXiJbA60hM+AyuTfQzIvw==",
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@base-ui/utils/-/utils-0.3.2.tgz",
+            "integrity": "sha512-oWy1aq/I2GmYjpl4PhEAhzflF8VPGKgZeq0xAWTbfD5KBWyxcN0ZP2+WHSUm/5Z6lVMBDLReLcoXwSYoRc/zNQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.29.2",
-                "@floating-ui/utils": "^0.2.11",
-                "reselect": "^5.1.1",
+                "@floating-ui/utils": "^0.2.12",
+                "reselect": "^5.2.0",
                 "use-sync-external-store": "^1.6.0"
             },
             "peerDependencies": {
@@ -3168,9 +3168,9 @@
             }
         },
         "node_modules/@gridsuite/commons-ui": {
-            "version": "0.295.0",
-            "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.295.0.tgz",
-            "integrity": "sha512-D3h9GDrq6jGZkIiUE6OtIkDVhKJzlctWwXsF81cNeWJU/N3RJ1nPKz2zSvfijb1Uh0lbM+uk7nnJrOyslRiywg==",
+            "version": "0.297.0",
+            "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.297.0.tgz",
+            "integrity": "sha512-5r65R2ghjwyv+FSGeZsXA8xKR2plY2qTNB4NjFNZDkZCHPI+0hluWq21IoygtAmQhDgHxVagbW8XzClERL4fjA==",
             "license": "MPL-2.0",
             "dependencies": {
                 "@ag-grid-community/locale": "^35.3.1",
@@ -3185,7 +3185,7 @@
                 "jwt-decode": "^4.0.0",
                 "localized-countries": "^2.0.0",
                 "mathjs": "^14.7.0",
-                "mui-nested-menu": "^4.0.1",
+                "mui-nested-menu": "^4.0.3",
                 "oidc-client-ts": "^3.5.0",
                 "prop-types": "^15.8.1",
                 "react-dnd": "^16.0.1",
@@ -3205,11 +3205,11 @@
                 "@emotion/react": "^11.14.0",
                 "@emotion/styled": "^11.14.0",
                 "@hookform/resolvers": "^4.0.0",
-                "@mui/icons-material": "^7.3.11",
-                "@mui/lab": "7.0.1-beta.25",
-                "@mui/material": "^7.3.11",
-                "@mui/x-charts": "^8.21.0",
-                "@mui/x-tree-view": "^8.21.0",
+                "@mui/icons-material": "^9.4.0",
+                "@mui/lab": "^9.0.0-beta.9",
+                "@mui/material": "^9.4.0",
+                "@mui/x-charts": "^9.13.0",
+                "@mui/x-tree-view": "^9.13.0",
                 "ag-grid-community": "^35.3.1",
                 "ag-grid-react": "^35.3.1",
                 "notistack": "^3.0.2",
@@ -3874,9 +3874,9 @@
             "license": "Apache-2.0"
         },
         "node_modules/@mui/core-downloads-tracker": {
-            "version": "7.3.11",
-            "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.11.tgz",
-            "integrity": "sha512-a7I/b/nBTdXYz2cOSlEmkQ9WWE1x8FHpqMhFPp+Y1VPFxcOw91G5ELOHARQAGSPy5V+UCgJua6K/1x70bAtQPw==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-9.4.0.tgz",
+            "integrity": "sha512-d+gIYM1raJP87yrVQcVg+Q3vycVMArMkgu/TjJLi2vTvO9FHKWNRR1xs9nnN4eLpM9nGxxm02UMvc9BrmcUKvQ==",
             "license": "MIT",
             "funding": {
                 "type": "opencollective",
@@ -3884,12 +3884,12 @@
             }
         },
         "node_modules/@mui/icons-material": {
-            "version": "7.3.11",
-            "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.3.11.tgz",
-            "integrity": "sha512-+hz5ilwHZ3djd5es3sCErLioqe/NhZcYTsV/TNXZAMdJdb23F4xzJjqnnZdnurc3S1+ietcssRNqieOhPQLZ7Q==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-9.4.0.tgz",
+            "integrity": "sha512-5PVgBYtLOXTk6u0YUAjoV9GoTUQDbeZ8g+pus2h0GphLT/rpmftRnB5D/Kw6QCAovB7EyBX7UxKdZqPBBAHUKw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6"
+                "@babel/runtime": "^7.29.7"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -3899,7 +3899,7 @@
                 "url": "https://opencollective.com/mui-org"
             },
             "peerDependencies": {
-                "@mui/material": "^7.3.11",
+                "@mui/material": "^9.4.0",
                 "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
             },
@@ -3910,15 +3910,15 @@
             }
         },
         "node_modules/@mui/lab": {
-            "version": "7.0.1-beta.25",
-            "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.1-beta.25.tgz",
-            "integrity": "sha512-itd2o0dKv8/1ZhAWTOkP+ZxiztC2dJ6rY0ECZFt3l3ylinShOfhgjbuqgS98M4UFIVzVLM5ynn+WhkEIp/5CMg==",
+            "version": "9.0.0-beta.9",
+            "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-9.0.0-beta.9.tgz",
+            "integrity": "sha512-LaYavRlbnsjGi09EYuRUpxUe4iqK1zWQHioxjJ0SXH7QBcYgmnUmHrMCwzsYb21VhpX5wjJ2ovLmX/CajGmvmw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6",
-                "@mui/system": "^7.3.11",
-                "@mui/types": "^7.4.12",
-                "@mui/utils": "^7.3.11",
+                "@babel/runtime": "^7.29.7",
+                "@mui/system": "^9.4.0",
+                "@mui/types": "^9.4.0",
+                "@mui/utils": "^9.4.0",
                 "clsx": "^2.1.1",
                 "prop-types": "^15.8.1"
             },
@@ -3932,8 +3932,8 @@
             "peerDependencies": {
                 "@emotion/react": "^11.5.0",
                 "@emotion/styled": "^11.3.0",
-                "@mui/material": "^7.3.11",
-                "@mui/material-pigment-css": "^7.3.11",
+                "@mui/material": "^9.4.0",
+                "@mui/material-pigment-css": "^9.4.0",
                 "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -3954,22 +3954,22 @@
             }
         },
         "node_modules/@mui/material": {
-            "version": "7.3.11",
-            "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.11.tgz",
-            "integrity": "sha512-yq8bPc3LxOwKRWpcjRgDkYFmpM6aKlARfESTmOQcvLYFeJwtHte2tw6hJDrb8sk8wcvpDprHEHVaoUU0MslIkw==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/material/-/material-9.4.0.tgz",
+            "integrity": "sha512-6KKUIvkQ2r/s48s9VZV9JEZ1W2dRa7RndVsF+Ipx4CYxDOQeozeRsS5r9NiheFf8A5hpbqJJIGoX7hjg5X4XUw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6",
-                "@mui/core-downloads-tracker": "^7.3.11",
-                "@mui/system": "^7.3.11",
-                "@mui/types": "^7.4.12",
-                "@mui/utils": "^7.3.11",
+                "@babel/runtime": "^7.29.7",
+                "@mui/core-downloads-tracker": "^9.4.0",
+                "@mui/system": "^9.4.0",
+                "@mui/types": "^9.4.0",
+                "@mui/utils": "^9.4.0",
                 "@popperjs/core": "^2.11.8",
                 "@types/react-transition-group": "^4.4.12",
                 "clsx": "^2.1.1",
                 "csstype": "^3.2.3",
                 "prop-types": "^15.8.1",
-                "react-is": "^19.2.3",
+                "react-is": "^19.2.8",
                 "react-transition-group": "^4.4.5"
             },
             "engines": {
@@ -3982,7 +3982,7 @@
             "peerDependencies": {
                 "@emotion/react": "^11.5.0",
                 "@emotion/styled": "^11.3.0",
-                "@mui/material-pigment-css": "^7.3.11",
+                "@mui/material-pigment-css": "^9.4.0",
                 "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -4003,13 +4003,13 @@
             }
         },
         "node_modules/@mui/private-theming": {
-            "version": "7.3.11",
-            "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.11.tgz",
-            "integrity": "sha512-9B+YKms0fRHbNrqp9tOT/DNbNnU5gyvJ1o3qAGXfq8GmZcbJnE3At9x07Zr/o0pkhzg4aDdwXVqe4+AcgtOCPA==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-9.4.0.tgz",
+            "integrity": "sha512-qQpX/2XPGDz5F2OIWzo4kkorURlDeXGKytRQudXCdLS5TuwKsMKaZyx77LZEVSB73c7o3UrLWwQ/goRuHBdtjw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6",
-                "@mui/utils": "^7.3.11",
+                "@babel/runtime": "^7.29.7",
+                "@mui/utils": "^9.4.0",
                 "prop-types": "^15.8.1"
             },
             "engines": {
@@ -4030,12 +4030,12 @@
             }
         },
         "node_modules/@mui/styled-engine": {
-            "version": "7.3.10",
-            "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.10.tgz",
-            "integrity": "sha512-WxE9SiF8xskAQqGjsp0poXCkCqsoXFEsSr0HBXfApmGHR+DBnXRp+z46Vsltg4gpPM4Z96DeAQRpeAOnhNg7Ng==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-9.4.0.tgz",
+            "integrity": "sha512-SlqVEYqnyEgXMFW4JuIDMelyhKzoWBJ85v2mNCQd0XtU0uk7U9E1zaJZ06XqodhA8oJrb+4Q+3E/JlwBe4jWkw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6",
+                "@babel/runtime": "^7.29.7",
                 "@emotion/cache": "^11.14.0",
                 "@emotion/serialize": "^1.3.3",
                 "@emotion/sheet": "^1.4.0",
@@ -4064,16 +4064,16 @@
             }
         },
         "node_modules/@mui/system": {
-            "version": "7.3.11",
-            "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.11.tgz",
-            "integrity": "sha512-7izwGWdNawAKpBKcRlx7f2gFnAAjmASBWvMcyX4YYEeLOFsbfGRbUYGInvnAcUeql3rPxI7F9Ft4oY2OLRz44g==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/system/-/system-9.4.0.tgz",
+            "integrity": "sha512-AZz9z13oGS1J0BYeAFHTbV7PegCtPiE/uMEIi7TJ1kTx3Vkt+jUpLyXF/2uV8B6Y79iTh98kVeOH9fX3x3zXXg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6",
-                "@mui/private-theming": "^7.3.11",
-                "@mui/styled-engine": "^7.3.10",
-                "@mui/types": "^7.4.12",
-                "@mui/utils": "^7.3.11",
+                "@babel/runtime": "^7.29.7",
+                "@mui/private-theming": "^9.4.0",
+                "@mui/styled-engine": "^9.4.0",
+                "@mui/types": "^9.4.0",
+                "@mui/utils": "^9.4.0",
                 "clsx": "^2.1.1",
                 "csstype": "^3.2.3",
                 "prop-types": "^15.8.1"
@@ -4104,12 +4104,12 @@
             }
         },
         "node_modules/@mui/types": {
-            "version": "7.4.12",
-            "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.12.tgz",
-            "integrity": "sha512-iKNAF2u9PzSIj40CjvKJWxFXJo122jXVdrmdh0hMYd+FR+NuJMkr/L88XwWLCRiJ5P1j+uyac25+Kp6YC4hu6w==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/types/-/types-9.4.0.tgz",
+            "integrity": "sha512-13DH0Oniua4WmGqeYbQAZqmiN7r4nfd0zwIoGJ5QeJwyIHgEmf+LkRw/jV1HZb6AiUoHX8Oxf4xgalq3vYHcIw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6"
+                "@babel/runtime": "^7.29.7"
             },
             "peerDependencies": {
                 "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -4121,17 +4121,17 @@
             }
         },
         "node_modules/@mui/utils": {
-            "version": "7.3.11",
-            "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.11.tgz",
-            "integrity": "sha512-XTjGnifwteg71/ij+0e7Y7d+hwyntMYP5wPoA/g2drdGH+Flkvjwy0OfrVpKBbaOvofq4zU/LIyUZyKgmWu18g==",
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.4.0.tgz",
+            "integrity": "sha512-WkzY8uYtqUDyGKPShrRQRBomfMQHddlsyKu/gRRESYO24tDPD2z0xRE8CBoUsWqpBa+YrFs9KixiS7kQRjsPAQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.6",
-                "@mui/types": "^7.4.12",
+                "@babel/runtime": "^7.29.7",
+                "@mui/types": "^9.4.0",
                 "@types/prop-types": "^15.7.15",
                 "clsx": "^2.1.1",
                 "prop-types": "^15.8.1",
-                "react-is": "^19.2.3"
+                "react-is": "^19.2.8"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -4151,21 +4151,21 @@
             }
         },
         "node_modules/@mui/x-charts": {
-            "version": "8.29.2",
-            "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.29.2.tgz",
-            "integrity": "sha512-s0f0gstCEBO4HV1aj4wNapL6RYREO+YyFLs4cSKm8bu347AuADngBtepNSCXuzsCQ+C+PxAlBoCy2a1ssTxMuA==",
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-9.13.0.tgz",
+            "integrity": "sha512-jpvIYoWISUQRrKz1/yu00SSU+bbyPo6rT/fhTQd0BTo07qxm4ZQ9Pseg9+WXztNVVhbzt4fsVElCcTxDyQocqw==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
-                "@babel/runtime": "^7.28.4",
-                "@mui/utils": "^7.3.5",
-                "@mui/x-charts-vendor": "8.29.0",
-                "@mui/x-internal-gestures": "0.5.0",
-                "@mui/x-internals": "8.29.2",
-                "bezier-easing": "^2.1.0",
+                "@babel/runtime": "^7.29.7",
+                "@mui/utils": "^9.4.0",
+                "@mui/x-charts-vendor": "^9.13.0",
+                "@mui/x-internal-gestures": "^9.13.0",
+                "@mui/x-internals": "^9.13.0",
+                "bezier-easing": "^3.0.1",
                 "clsx": "^2.1.1",
                 "prop-types": "^15.8.1",
-                "reselect": "^5.1.1",
+                "reselect": "^5.2.0",
                 "use-sync-external-store": "^1.6.0"
             },
             "engines": {
@@ -4174,8 +4174,8 @@
             "peerDependencies": {
                 "@emotion/react": "^11.9.0",
                 "@emotion/styled": "^11.8.1",
-                "@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0",
-                "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
+                "@mui/material": "^7.3.0 || ^9.0.0",
+                "@mui/system": "^7.3.0 || ^9.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
             },
@@ -4189,26 +4189,28 @@
             }
         },
         "node_modules/@mui/x-charts-vendor": {
-            "version": "8.29.0",
-            "resolved": "https://registry.npmjs.org/@mui/x-charts-vendor/-/x-charts-vendor-8.29.0.tgz",
-            "integrity": "sha512-nYjgW337QxvCJXct8b0UIir9ELDjMEfWSmMVSfUQsEjn3ZD5jjK3MQVZSHSM1hP79PZcjRQIAuWI1fHkqG04ug==",
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@mui/x-charts-vendor/-/x-charts-vendor-9.13.0.tgz",
+            "integrity": "sha512-Pp3lTklKjQX0SEobj8qbdgWEH2KXFMjAmUYUYT/DSDogXyNZmMIsyiCaN3stroQ2QZ30BaTa4fL0K/RVzNGnBA==",
             "license": "MIT AND ISC",
             "peer": true,
             "dependencies": {
-                "@babel/runtime": "^7.28.4",
+                "@babel/runtime": "^7.29.7",
                 "@types/d3-array": "^3.2.2",
                 "@types/d3-color": "^3.1.3",
                 "@types/d3-format": "^3.0.4",
+                "@types/d3-geo": "^3.1.1",
                 "@types/d3-interpolate": "^3.0.4",
                 "@types/d3-path": "^3.1.1",
                 "@types/d3-scale": "^4.0.9",
-                "@types/d3-shape": "^3.1.8",
+                "@types/d3-shape": "^3.2.0",
                 "@types/d3-time": "^3.0.4",
                 "@types/d3-time-format": "^4.0.3",
                 "@types/d3-timer": "^3.0.2",
                 "d3-array": "^3.2.4",
                 "d3-color": "^3.1.0",
                 "d3-format": "^3.1.2",
+                "d3-geo": "^3.1.1",
                 "d3-interpolate": "^3.0.1",
                 "d3-path": "^3.1.0",
                 "d3-scale": "^4.0.2",
@@ -4216,20 +4218,20 @@
                 "d3-time": "^3.1.0",
                 "d3-time-format": "^4.1.0",
                 "d3-timer": "^3.0.1",
-                "flatqueue": "^3.0.0",
+                "flatqueue": "^3.1.0",
                 "internmap": "^2.0.3"
             }
         },
         "node_modules/@mui/x-date-pickers": {
-            "version": "7.29.4",
-            "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.29.4.tgz",
-            "integrity": "sha512-wJ3tsqk/y6dp+mXGtT9czciAMEO5Zr3IIAHg9x6IL0Eqanqy0N3chbmQQZv3iq0m2qUpQDLvZ4utZBUTJdjNzw==",
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-9.13.0.tgz",
+            "integrity": "sha512-OdxxL8Q89bktqtXw35wcJXE1q+DbJrO0GRcXn6GzXpTvoiEd8NCdF10WENGmQiBG6GZnPHGNw3j7dSNcZhFEww==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.25.7",
-                "@mui/utils": "^5.16.6 || ^6.0.0 || ^7.0.0",
-                "@mui/x-internals": "7.29.0",
-                "@types/react-transition-group": "^4.4.11",
+                "@babel/runtime": "^7.29.7",
+                "@mui/utils": "^9.4.0",
+                "@mui/x-internals": "^9.13.0",
+                "@types/react-transition-group": "^4.4.12",
                 "clsx": "^2.1.1",
                 "prop-types": "^15.8.1",
                 "react-transition-group": "^4.4.5"
@@ -4244,8 +4246,8 @@
             "peerDependencies": {
                 "@emotion/react": "^11.9.0",
                 "@emotion/styled": "^11.8.1",
-                "@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0",
-                "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
+                "@mui/material": "^7.3.0 || ^9.0.0",
+                "@mui/system": "^7.3.0 || ^9.0.0",
                 "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0",
                 "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0",
                 "dayjs": "^1.10.7",
@@ -4286,45 +4288,31 @@
                 }
             }
         },
-        "node_modules/@mui/x-date-pickers/node_modules/@mui/x-internals": {
-            "version": "7.29.0",
-            "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.29.0.tgz",
-            "integrity": "sha512-+Gk6VTZIFD70XreWvdXBwKd8GZ2FlSCuecQFzm6znwqXg1ZsndavrhG9tkxpxo2fM1Zf7Tk8+HcOO0hCbhTQFA==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/runtime": "^7.25.7",
-                "@mui/utils": "^5.16.6 || ^6.0.0 || ^7.0.0"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/mui-org"
-            },
-            "peerDependencies": {
-                "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-            }
-        },
         "node_modules/@mui/x-internal-gestures": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/@mui/x-internal-gestures/-/x-internal-gestures-0.5.0.tgz",
-            "integrity": "sha512-LTnaD8WAWld9ecW8Q5tO4Sq2ucyMWca4SKDu6Cx+0RHO3XfgMa7NxB7aBzldAYMN8QrSquBVdu8Zcf9cnp8qwQ==",
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@mui/x-internal-gestures/-/x-internal-gestures-9.13.0.tgz",
+            "integrity": "sha512-GbjgDPLAZeVUu9ng09wS9oEzZlkRQQ5xi1355muG+UX+Ot5VLNqPQmv8PPIXt0HxpfaN67kF1YJpQBLIzOsj/g==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
-                "@babel/runtime": "^7.28.4"
+                "@babel/runtime": "^7.29.7",
+                "@base-ui/utils": "^0.3.2"
+            },
+            "peerDependencies": {
+                "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+                "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
         "node_modules/@mui/x-internals": {
-            "version": "8.29.2",
-            "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.29.2.tgz",
-            "integrity": "sha512-TLILyHia5NHh3MGErFDh0bXZ4V6iS45hdStofsV5wklF6dpgZjduo65oJB0h81mI5mexNlhHANEVfw0KV6BxBg==",
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-9.13.0.tgz",
+            "integrity": "sha512-TAxYhWSQR351zhUO709ShsGlvbI9RSsh6zIn99tLmkxKav+QFoxAlullzd79dQOxjUsau6spw/hmYcB+zLGipQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.4",
-                "@mui/utils": "^7.3.5",
-                "reselect": "^5.1.1",
+                "@babel/runtime": "^7.29.7",
+                "@base-ui/utils": "^0.3.2",
+                "@mui/utils": "^9.4.0",
+                "reselect": "^5.2.0",
                 "use-sync-external-store": "^1.6.0"
             },
             "engines": {
@@ -4335,23 +4323,22 @@
                 "url": "https://opencollective.com/mui-org"
             },
             "peerDependencies": {
-                "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+                "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+                "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
         "node_modules/@mui/x-tree-view": {
-            "version": "8.29.2",
-            "resolved": "https://registry.npmjs.org/@mui/x-tree-view/-/x-tree-view-8.29.2.tgz",
-            "integrity": "sha512-HpgT5SDhP/YhOUWnXw+J+GlYaQUM1TwWM6nayDNM33GEVFMRQ29/dbNtVk7woZkF5Uw9fpgp53ZoYU1dByi9ig==",
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@mui/x-tree-view/-/x-tree-view-9.13.0.tgz",
+            "integrity": "sha512-wnIXe5bhbm1nFo6cofQBVb1Zll5oD3e7MkEZ78wXHY5nKjjathIbPZ7J7bFSCa/OIdtMCaLpholVLG2Bi73CeA==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.28.4",
-                "@base-ui/utils": "^0.2.3",
-                "@mui/utils": "^7.3.5",
-                "@mui/x-internals": "8.29.2",
-                "@types/react-transition-group": "^4.4.12",
+                "@babel/runtime": "^7.29.7",
+                "@base-ui/utils": "^0.3.2",
+                "@mui/utils": "^9.4.0",
+                "@mui/x-internals": "^9.13.0",
                 "clsx": "^2.1.1",
-                "prop-types": "^15.8.1",
-                "react-transition-group": "^4.4.5"
+                "prop-types": "^15.8.1"
             },
             "engines": {
                 "node": ">=14.0.0"
@@ -4363,8 +4350,8 @@
             "peerDependencies": {
                 "@emotion/react": "^11.9.0",
                 "@emotion/styled": "^11.8.1",
-                "@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0",
-                "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
+                "@mui/material": "^7.3.0 || ^9.0.0",
+                "@mui/system": "^7.3.0 || ^9.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
             },
@@ -5521,6 +5508,16 @@
             "license": "MIT",
             "peer": true
         },
+        "node_modules/@types/d3-geo": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.1.tgz",
+            "integrity": "sha512-65Emv9fQiQQqphLlRkuQ5ypPsOmWPhtBGCMv61JDPEPMvsx+gzhGf74yw1a78xFKPj6zw4AgQICJoQv0vK9M2w==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@types/geojson": "*"
+            }
+        },
         "node_modules/@types/d3-interpolate": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
@@ -5549,9 +5546,9 @@
             }
         },
         "node_modules/@types/d3-shape": {
-            "version": "3.1.8",
-            "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
-            "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.2.0.tgz",
+            "integrity": "sha512-kVd74ta9eof3eJOvbNd1vGKS/XERRyQbT26Og63hIsvDO84cjD5gEOhsXf26w3FSoNlPVz84DOFcKv/oou+fMw==",
             "license": "MIT",
             "peer": true,
             "dependencies": {
@@ -5604,6 +5601,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/geojson": {
+            "version": "7946.0.16",
+            "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+            "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+            "license": "MIT",
+            "peer": true
+        },
         "node_modules/@types/hoist-non-react-statics": {
             "version": "3.3.7",
             "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz",
@@ -7121,9 +7125,9 @@
             }
         },
         "node_modules/bezier-easing": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz",
-            "integrity": "sha512-gbIqZ/eslnUFC1tjEvtz0sgx+xTK20wDnYMIA27VA04R7w6xxXQPZDbibjA9DTWZRA2CXtwHykkVzlCaAJAZig==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-3.1.0.tgz",
+            "integrity": "sha512-o8E/9YIVAzS6S2i5Icp/DUjQXiP9ma6viSef0b8LpyTvoJw/al+jMhH8tllA18n8VY9M0J1CeWqNs2Ym5PSjOQ==",
             "license": "MIT",
             "peer": true
         },
@@ -7663,6 +7667,19 @@
                 "node": ">=12"
             }
         },
+        "node_modules/d3-geo": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+            "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+            "license": "ISC",
+            "peer": true,
+            "dependencies": {
+                "d3-array": "2.5.0 - 3"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/d3-interpolate": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
@@ -12150,9 +12167,9 @@
             "license": "BlueOak-1.0.0"
         },
         "node_modules/papaparse": {
-            "version": "5.5.4",
-            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.4.tgz",
-            "integrity": "sha512-SwzWD9gl/ElwYLCI0nUja1mFJzjq2D8ziShfNBa7zCHzkOozeOGDwHWQ+tvCzEZcewecWZ5U7kUopDnG+DFYEQ==",
+            "version": "5.7.0",
+            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.7.0.tgz",
+            "integrity": "sha512-qBGxg/7Q3Kl9Wfhrz2Z74UnvnHTXLNG6jmKJFeBvP2+y4lV7So+7SR62+Zd47JvdrCkX+nDcnr0ObPzek/+6RA==",
             "license": "MIT",
             "peer": true
         },
@@ -12619,9 +12636,9 @@
             }
         },
         "node_modules/react-hook-form-mui": {
-            "version": "7.6.2",
-            "resolved": "https://registry.npmjs.org/react-hook-form-mui/-/react-hook-form-mui-7.6.2.tgz",
-            "integrity": "sha512-mRzQHHxh45CD/89vxpTAGLeMYos78EmREG5J8TX4J2UOBT3gMUCPElp3Xr2b+ky1jI30UsqPEkQK44vThVSlkQ==",
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/react-hook-form-mui/-/react-hook-form-mui-9.0.1.tgz",
+            "integrity": "sha512-PkgKccWWK+ZB4HH/WjCuphiVIE0JN/z/k2ksfwReLeIg70iAS0luzI4LZn9NzqzWOXIJ90jpsOs5m/4jdDkzGA==",
             "license": "MIT",
             "workspaces": [
                 "apps/*",
@@ -12631,11 +12648,12 @@
                 "node": ">=14"
             },
             "peerDependencies": {
-                "@mui/icons-material": ">= 5.x <8",
-                "@mui/material": ">= 5.x <8",
-                "@mui/x-date-pickers": ">=7.17.0 <8",
-                "react": ">=17 <20",
-                "react-hook-form": ">=7.33.1"
+                "@mui/icons-material": "^9.0.0",
+                "@mui/material": "^9.0.0",
+                "@mui/system": "^9.0.0",
+                "@mui/x-date-pickers": "^9.0.0",
+                "react": ">=18 <21",
+                "react-hook-form": ">=7.62.0"
             },
             "peerDependenciesMeta": {
                 "@mui/icons-material": {
diff --git a/package.json b/package.json
index d306b39..51564f9 100644
--- a/package.json
+++ b/package.json
@@ -16,13 +16,13 @@
     "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
-        "@gridsuite/commons-ui": "0.295.0",
+        "@gridsuite/commons-ui": "0.297.0",
         "@hookform/resolvers": "^4.1.3",
-        "@mui/icons-material": "^7.3.11",
-        "@mui/lab": "7.0.1-beta.25",
-        "@mui/material": "^7.3.11",
-        "@mui/x-date-pickers": "^7.29.4",
-        "@mui/x-tree-view": "^8.21.0",
+        "@mui/icons-material": "^9.4.0",
+        "@mui/lab": "^9.0.0-beta.9",
+        "@mui/material": "^9.4.0",
+        "@mui/x-date-pickers": "^9.13.0",
+        "@mui/x-tree-view": "^9.13.0",
         "@reduxjs/toolkit": "^2.9.0",
         "ag-grid-community": "^35.3.1",
         "ag-grid-react": "^35.3.1",
@@ -32,7 +32,7 @@
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "react-hook-form": "^7.62.0",
-        "react-hook-form-mui": "^7.6.2",
+        "react-hook-form-mui": "^9.0.1",
         "react-intl": "^7.1.11",
         "react-redux": "^9.2.0",
         "react-router": "^7.8.2",
@@ -103,5 +103,10 @@
         "vite-plugin-checker": "^0.11.0",
         "vite-plugin-svgr": "^4.5.0",
         "vite-tsconfig-paths": "^5.1.4"
+    },
+    "overrides": {
+        "mui-nested-menu": {
+            "@mui/material": ">=5.0.0"
+        }
     }
 }
diff --git a/src/components/App/AppWrapper.tsx b/src/components/App/AppWrapper.tsx
index 5e63219..f928300 100644
--- a/src/components/App/AppWrapper.tsx
+++ b/src/components/App/AppWrapper.tsx
@@ -11,7 +11,7 @@ import { CssBaseline, responsiveFontSizes, ThemeOptions } from '@mui/material';
 import { createTheme, StyledEngineProvider, Theme, ThemeProvider } from '@mui/material/styles';
 import { enUS as MuiCoreEnUS, frFR as MuiCoreFrFR } from '@mui/material/locale';
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
 import { enUS as MuiDatePickersEnUS, frFR as MuiDatePickersFrFR } from '@mui/x-date-pickers/locales';
 import { enUS as dateFnsEnUS, fr as dateFnsFr } from 'date-fns/locale';
 import {
diff --git a/src/components/App/HomePage.tsx b/src/components/App/HomePage.tsx
index 3f756f1..ebf3d87 100644
--- a/src/components/App/HomePage.tsx
+++ b/src/components/App/HomePage.tsx
@@ -11,7 +11,14 @@ import { FormattedMessage } from 'react-intl';
 
 export default function HomePage(): ReactElement {
     return (
-        <Grid id="home-page" size={12} alignSelf="center" component="section">
+        <Grid
+            id="home-page"
+            size={12}
+            component="section"
+            sx={{
+                alignSelf: 'center',
+            }}
+        >
             <Typography variant="h3" color="textPrimary" align="center">
                 <FormattedMessage id="connected" />
             </Typography>
diff --git a/src/components/App/PageNotFound.tsx b/src/components/App/PageNotFound.tsx
index 545d1c8..5410b34 100644
--- a/src/components/App/PageNotFound.tsx
+++ b/src/components/App/PageNotFound.tsx
@@ -6,7 +6,7 @@
  */
 
 import { Container } from '@mui/material';
-import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
+import ErrorOutlinedIcon from '@mui/icons-material/ErrorOutlined';
 import { ReactNode } from 'react';
 import { type MuiStyles } from '@gridsuite/commons-ui';
 
@@ -25,7 +25,7 @@ const PageNotFound = ({ message }: { message: ReactNode }) => {
     return (
         <Container sx={styles.container}>
             <br />
-            <ErrorOutlineIcon sx={styles.error} />
+            <ErrorOutlinedIcon sx={styles.error} />
             <h1 style={{ textAlign: 'center' }}>{message}</h1>
         </Container>
     );
diff --git a/src/components/Grid/GridTable.tsx b/src/components/Grid/GridTable.tsx
index 8eadb55..11e8062 100644
--- a/src/components/Grid/GridTable.tsx
+++ b/src/components/Grid/GridTable.tsx
@@ -73,7 +73,13 @@ export const GridTable: GridTableWithRef = forwardRef(function AgGridToolbar<TDa
     );
 
     return (
-        <Stack justifyContent="flex-start" alignItems="stretch" width={'100%'}>
+        <Stack
+            sx={{
+                justifyContent: 'flex-start',
+                alignItems: 'stretch',
+                width: '100%',
+            }}
+        >
             <AppBar position="static" color="default">
                 <Toolbar
                     variant="dense"
diff --git a/src/pages/announcements/add-announcement-form.tsx b/src/pages/announcements/add-announcement-form.tsx
index 80d9685..6224d0d 100644
--- a/src/pages/announcements/add-announcement-form.tsx
+++ b/src/pages/announcements/add-announcement-form.tsx
@@ -135,7 +135,12 @@ export default function AddAnnouncementForm({ onAnnouncementCreated }: Readonly<
             FormProps={{ style: { height: '100%' } }}
         >
             <FormErrorProvider onError={onErrorIntl}>
-                <Stack spacing={1} height="100%">
+                <Stack
+                    spacing={1}
+                    sx={{
+                        height: '100%',
+                    }}
+                >
                     <Grid container spacing={1}>
                         <Grid size={{ xs: 12, lg: 6 }}>
                             <DateTimePickerElement<FormSchema>
diff --git a/src/pages/announcements/announcements-page.tsx b/src/pages/announcements/announcements-page.tsx
index c45116e..64e9c65 100644
--- a/src/pages/announcements/announcements-page.tsx
+++ b/src/pages/announcements/announcements-page.tsx
@@ -122,7 +122,12 @@ export default function AnnouncementsPage() {
     return (
         <Grid container spacing={2} sx={{ p: 1, height: '100%', width: '100%' }}>
             <Grid size={{ xs: 12, sm: 6, md: 4 }} sx={{ display: 'flex' }}>
-                <Stack height="100%" sx={{ flexGrow: 1 }}>
+                <Stack
+                    sx={{
+                        height: '100%',
+                        flexGrow: 1,
+                    }}
+                >
                     <Typography variant="subtitle1">
                         <FormattedMessage id="announcements.programNewMessage" />
                     </Typography>
@@ -133,8 +138,17 @@ export default function AnnouncementsPage() {
                 </Stack>
             </Grid>
             <Grid size={{ xs: 12, sm: 6, md: 8 }}>
-                <Stack height="100%">
-                    <Typography variant="subtitle1" mb={0.5}>
+                <Stack
+                    sx={{
+                        height: '100%',
+                    }}
+                >
+                    <Typography
+                        variant="subtitle1"
+                        sx={{
+                            mb: 0.5,
+                        }}
+                    >
                         <FormattedMessage id="announcements.programmedMessage" />
                     </Typography>
                     <Box sx={{ flexGrow: 1 }}>
diff --git a/src/pages/groups/add-group-dialog.tsx b/src/pages/groups/add-group-dialog.tsx
index 8e56097..61ee3be 100644
--- a/src/pages/groups/add-group-dialog.tsx
+++ b/src/pages/groups/add-group-dialog.tsx
@@ -96,15 +96,17 @@ const AddGroupDialog: FunctionComponent<AddGroupDialogProps> = (props) => {
                             fullWidth
                             variant="standard"
                             inputMode="text"
-                            InputProps={{
-                                startAdornment: (
-                                    <InputAdornment position="start">
-                                        <Groups />
-                                    </InputAdornment>
-                                ),
-                            }}
                             error={fieldState?.invalid}
                             helperText={fieldState?.error?.message}
+                            slotProps={{
+                                input: {
+                                    startAdornment: (
+                                        <InputAdornment position="start">
+                                            <Groups />
+                                        </InputAdornment>
+                                    ),
+                                },
+                            }}
                         />
                     )}
                 />
diff --git a/src/pages/groups/modification/group-modification-form.tsx b/src/pages/groups/modification/group-modification-form.tsx
index 0bda7b3..26c8c13 100644
--- a/src/pages/groups/modification/group-modification-form.tsx
+++ b/src/pages/groups/modification/group-modification-form.tsx
@@ -60,7 +60,15 @@ const GroupModificationForm: FunctionComponent<GroupModificationFormProps> = ({
     );
 
     return (
-        <Grid container spacing={2} marginTop={2} sx={{ height: '100%', width: '100%' }}>
+        <Grid
+            container
+            spacing={2}
+            sx={{
+                marginTop: 2,
+                height: '100%',
+                width: '100%',
+            }}
+        >
             <Grid sx={{ width: '100%' }}>
                 <TextInput name={GROUP_NAME} label={'groups.table.id'} clearable={true} />
             </Grid>
diff --git a/src/pages/profiles/add-profile-dialog.tsx b/src/pages/profiles/add-profile-dialog.tsx
index c52cd31..b811f44 100644
--- a/src/pages/profiles/add-profile-dialog.tsx
+++ b/src/pages/profiles/add-profile-dialog.tsx
@@ -100,15 +100,17 @@ const AddProfileDialog: FunctionComponent<AddProfileDialogProps> = (props) => {
                             fullWidth
                             variant="standard"
                             inputMode="text"
-                            InputProps={{
-                                startAdornment: (
-                                    <InputAdornment position="start">
-                                        <ManageAccounts />
-                                    </InputAdornment>
-                                ),
-                            }}
                             error={fieldState?.invalid}
                             helperText={fieldState?.error?.message}
+                            slotProps={{
+                                input: {
+                                    startAdornment: (
+                                        <InputAdornment position="start">
+                                            <ManageAccounts />
+                                        </InputAdornment>
+                                    ),
+                                },
+                            }}
                         />
                     )}
                 />
diff --git a/src/pages/profiles/modification/configuration-selection.tsx b/src/pages/profiles/modification/configuration-selection.tsx
index 7381ed4..55fad60 100644
--- a/src/pages/profiles/modification/configuration-selection.tsx
+++ b/src/pages/profiles/modification/configuration-selection.tsx
@@ -99,7 +99,13 @@ const ConfigurationSelection: FunctionComponent<ConfigSelectionProps> = (props)
     };
 
     return (
-        <Grid container columns={24} alignItems={'center'}>
+        <Grid
+            container
+            columns={24}
+            sx={{
+                alignItems: 'center',
+            }}
+        >
             <Grid size={1}>
                 <IconButton edge="start" onClick={handleResetConfig} disableRipple={watchConfigId === undefined}>
                     <Tooltip
diff --git a/src/pages/profiles/modification/profile-modification-form.tsx b/src/pages/profiles/modification/profile-modification-form.tsx
index 34ce432..40c4c25 100644
--- a/src/pages/profiles/modification/profile-modification-form.tsx
+++ b/src/pages/profiles/modification/profile-modification-form.tsx
@@ -40,7 +40,14 @@ const configList: ConfigSelectionProps[] = [
 
 const ProfileModificationForm: FunctionComponent = () => {
     return (
-        <Grid container spacing={2} marginTop={2} sx={{ width: '100%' }}>
+        <Grid
+            container
+            spacing={2}
+            sx={{
+                marginTop: 2,
+                width: '100%',
+            }}
+        >
             <Grid sx={{ width: '100%' }}>
                 <TextInput name={PROFILE_NAME} label={'profiles.table.id'} clearable={true} />
             </Grid>
@@ -64,13 +71,29 @@ const ProfileModificationForm: FunctionComponent = () => {
                     <FormattedMessage id={'profiles.form.modification.userQuotas'} />
                 </h3>
             </Grid>
-            <Grid container spacing={2} direction="row" marginLeft={'auto'} sx={{ width: '100%' }}>
+            <Grid
+                container
+                spacing={2}
+                direction="row"
+                sx={{
+                    marginLeft: 'auto',
+                    width: '100%',
+                }}
+            >
                 <Grid sx={{ width: '100%' }}>
                     <h4>
                         <FormattedMessage id={'profiles.form.modification.userCaseAndBuildsQuotas'} />
                     </h4>
                 </Grid>
-                <Grid container spacing={2} direction="row" marginLeft={'auto'} sx={{ width: '100%' }}>
+                <Grid
+                    container
+                    spacing={2}
+                    direction="row"
+                    sx={{
+                        marginLeft: 'auto',
+                        width: '100%',
+                    }}
+                >
                     <Grid size={4}>
                         <IntegerInput
                             name={UserQuotaNb.CASE}
@@ -91,7 +114,15 @@ const ProfileModificationForm: FunctionComponent = () => {
                         <FormattedMessage id={'profiles.form.modification.parallelExecutionsQuotas'} />
                     </h4>
                 </Grid>
-                <Grid container spacing={2} direction="row" marginLeft={'auto'} sx={{ width: '100%' }}>
+                <Grid
+                    container
+                    spacing={2}
+                    direction="row"
+                    sx={{
+                        marginLeft: 'auto',
+                        width: '100%',
+                    }}
+                >
                     <Grid size={4}>
                         <IntegerInput
                             name={UserQuotaNb.LOADFLOW}
@@ -114,7 +145,15 @@ const ProfileModificationForm: FunctionComponent = () => {
                         />
                     </Grid>
                 </Grid>
-                <Grid container spacing={2} direction="row" marginLeft={'auto'} sx={{ width: '100%' }}>
+                <Grid
+                    container
+                    spacing={2}
+                    direction="row"
+                    sx={{
+                        marginLeft: 'auto',
+                        width: '100%',
+                    }}
+                >
                     <Grid size={4}>
                         <IntegerInput
                             name={UserQuotaNb.SHORTCIRCUIT}
@@ -137,7 +176,15 @@ const ProfileModificationForm: FunctionComponent = () => {
                         />
                     </Grid>
                 </Grid>
-                <Grid container spacing={2} direction="row" marginLeft={'auto'} sx={{ width: '100%' }}>
+                <Grid
+                    container
+                    spacing={2}
+                    direction="row"
+                    sx={{
+                        marginLeft: 'auto',
+                        width: '100%',
+                    }}
+                >
                     <Grid size={4}>
                         <IntegerInput
                             name={UserQuotaNb.STATE_ESTIMATION}
@@ -160,7 +207,15 @@ const ProfileModificationForm: FunctionComponent = () => {
                         />
                     </Grid>
                 </Grid>
-                <Grid container spacing={2} direction="row" marginLeft={'auto'} sx={{ width: '100%' }}>
+                <Grid
+                    container
+                    spacing={2}
+                    direction="row"
+                    sx={{
+                        marginLeft: 'auto',
+                        width: '100%',
+                    }}
+                >
                     <Grid size={4}>
                         <IntegerInput
                             name={UserQuotaNb.DYNAMIC_SECURITY_INIT}
diff --git a/src/pages/users/add-user-dialog.tsx b/src/pages/users/add-user-dialog.tsx
index 4b89d39..a6215c4 100644
--- a/src/pages/users/add-user-dialog.tsx
+++ b/src/pages/users/add-user-dialog.tsx
@@ -97,15 +97,17 @@ const AddUserDialog: FunctionComponent<AddUserDialogProps> = (props) => {
                             fullWidth
                             variant="standard"
                             inputMode="text"
-                            InputProps={{
-                                startAdornment: (
-                                    <InputAdornment position="start">
-                                        <AccountCircle />
-                                    </InputAdornment>
-                                ),
-                            }}
                             error={fieldState?.invalid}
                             helperText={fieldState?.error?.message}
+                            slotProps={{
+                                input: {
+                                    startAdornment: (
+                                        <InputAdornment position="start">
+                                            <AccountCircle />
+                                        </InputAdornment>
+                                    ),
+                                },
+                            }}
                         />
                     )}
                 />
diff --git a/src/pages/users/modification/user-modification-form.tsx b/src/pages/users/modification/user-modification-form.tsx
index d2ff149..24d269b 100644
--- a/src/pages/users/modification/user-modification-form.tsx
+++ b/src/pages/users/modification/user-modification-form.tsx
@@ -74,7 +74,15 @@ const UserModificationForm: FunctionComponent<UserModificationFormProps> = ({
     );
 
     return (
-        <Grid container spacing={2} marginTop={2} sx={{ height: '100%', width: '100%' }}>
+        <Grid
+            container
+            spacing={2}
+            sx={{
+                marginTop: 2,
+                height: '100%',
+                width: '100%',
+            }}
+        >
             <Grid sx={{ width: '100%' }}>
                 <TextInput
                     name={USER_NAME}
@@ -92,7 +100,14 @@ const UserModificationForm: FunctionComponent<UserModificationFormProps> = ({
                 />
             </Grid>
             <Grid sx={{ width: '100%' }}>
-                <Grid container columns={24} columnSpacing={3} alignItems="center">
+                <Grid
+                    container
+                    columns={24}
+                    columnSpacing={3}
+                    sx={{
+                        alignItems: 'center',
+                    }}
+                >
                     <Grid size={23}>
                         <AutocompleteInput
                             name={USER_PROFILE_NAME}