diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js
index 475d7c6500..dc3608183b 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js
@@ -401,7 +401,7 @@ describe('ADMIN | PAGES | AUTH | BaseLogin', () => {
         opacity: 1;
       }
 
-      .c19:disabled {
+      .c19[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -439,7 +439,7 @@ describe('ADMIN | PAGES | AUTH | BaseLogin', () => {
         opacity: 1;
       }
 
-      .c20:disabled {
+      .c20[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -600,6 +600,7 @@ describe('ADMIN | PAGES | AUTH | BaseLogin', () => {
                       class="c1 c17 c18"
                     >
                       <input
+                        aria-disabled="false"
                         aria-invalid="false"
                         class="c19"
                         id="textinput-1"
@@ -633,6 +634,7 @@ describe('ADMIN | PAGES | AUTH | BaseLogin', () => {
                       class="c1 c17 c18"
                     >
                       <input
+                        aria-disabled="false"
                         aria-invalid="false"
                         class="c20"
                         id="textinput-2"
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js
index b0d21b11f6..3353c90bc8 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js
@@ -407,7 +407,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
         opacity: 1;
       }
 
-      .c29:disabled {
+      .c29[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -445,7 +445,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
         opacity: 1;
       }
 
-      .c30:disabled {
+      .c30[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -690,6 +690,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
                                 class="c0 c27 c28"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c29"
                                   id="textinput-2"
@@ -730,6 +731,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
                                 class="c0 c27 c28"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c29"
                                   id="textinput-3"
@@ -765,6 +767,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
                           class="c0 c27 c28"
                         >
                           <input
+                            aria-disabled="false"
                             aria-invalid="false"
                             class="c29"
                             id="textinput-4"
@@ -799,6 +802,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
                         >
                           <input
                             aria-describedby="textinput-5-hint"
+                            aria-disabled="false"
                             aria-invalid="false"
                             class="c30"
                             id="textinput-5"
@@ -860,6 +864,7 @@ describe('ADMIN | PAGES | AUTH | Register', () => {
                           class="c0 c27 c28"
                         >
                           <input
+                            aria-disabled="false"
                             aria-invalid="false"
                             class="c30"
                             id="textinput-6"
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js
index 4e3ab5b9d7..1cb9bc5e4c 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js
@@ -350,7 +350,7 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
         opacity: 1;
       }
 
-      .c23:disabled {
+      .c23[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -554,6 +554,7 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
                         >
                           <input
                             aria-describedby="textinput-2-hint"
+                            aria-disabled="false"
                             aria-invalid="false"
                             class="c23"
                             id="textinput-2"
@@ -615,6 +616,7 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
                           class="c0 c21 c22"
                         >
                           <input
+                            aria-disabled="false"
                             aria-invalid="false"
                             class="c23"
                             id="textinput-3"
diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
index 9a951e2c0e..c0a81b3c54 100644
--- a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
@@ -428,7 +428,7 @@ describe('ADMIN | Pages | Profile page', () => {
         opacity: 1;
       }
 
-      .c26:disabled {
+      .c26[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -666,6 +666,7 @@ describe('ADMIN | Pages | Profile page', () => {
                                 class="c24 c25"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c26"
                                   id="textinput-1"
@@ -707,6 +708,7 @@ describe('ADMIN | Pages | Profile page', () => {
                                 class="c24 c25"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c26"
                                   id="textinput-2"
@@ -748,6 +750,7 @@ describe('ADMIN | Pages | Profile page', () => {
                                 class="c24 c25"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c26"
                                   id="textinput-3"
@@ -789,6 +792,7 @@ describe('ADMIN | Pages | Profile page', () => {
                                 class="c24 c25"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c26"
                                   id="textinput-4"
@@ -847,6 +851,7 @@ describe('ADMIN | Pages | Profile page', () => {
                                 class="c24 c25"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c26"
                                   id="textinput-5"
@@ -888,6 +893,7 @@ describe('ADMIN | Pages | Profile page', () => {
                                 class="c24 c25"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c26"
                                   id="textinput-6"
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap
index 49531c40da..1decf60a51 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap
@@ -379,7 +379,7 @@ exports[`<EditPage /> renders and matches the snapshot 1`] = `
   opacity: 1;
 }
 
-.c26:disabled {
+.c26[aria-disabled='true'] {
   background: inherit;
   color: inherit;
 }
@@ -674,6 +674,7 @@ exports[`<EditPage /> renders and matches the snapshot 1`] = `
                             class="c1 c3 c25"
                           >
                             <input
+                              aria-disabled="false"
                               aria-invalid="false"
                               class="c26"
                               id="textinput-1"
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/CreatePage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/CreatePage/tests/__snapshots__/index.test.js.snap
index 5408e4541e..6da31eac35 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/CreatePage/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/CreatePage/tests/__snapshots__/index.test.js.snap
@@ -379,7 +379,7 @@ exports[`<CreatePage /> renders and matches the snapshot 1`] = `
   opacity: 1;
 }
 
-.c26:disabled {
+.c26[aria-disabled='true'] {
   background: inherit;
   color: inherit;
 }
@@ -681,6 +681,7 @@ exports[`<CreatePage /> renders and matches the snapshot 1`] = `
                             class="c1 c3 c25"
                           >
                             <input
+                              aria-disabled="false"
                               aria-invalid="false"
                               class="c26"
                               id="textinput-1"
diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index 809ef210b8..63d1e7225b 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -40,8 +40,8 @@
     "@fortawesome/react-fontawesome": "^0.1.14",
     "@strapi/babel-plugin-switch-ee-ce": "1.0.0",
     "@strapi/helper-plugin": "3.6.8",
-    "@strapi/icons": "0.0.1-alpha.30",
-    "@strapi/parts": "0.0.1-alpha.30",
+    "@strapi/icons": "0.0.1-alpha.31",
+    "@strapi/parts": "0.0.1-alpha.31",
     "@strapi/utils": "3.6.8",
     "axios": "^0.21.1",
     "babel-loader": "8.2.2",
diff --git a/packages/core/email/admin/src/pages/Settings/tests/index.test.js b/packages/core/email/admin/src/pages/Settings/tests/index.test.js
index b9b98cd9ce..c040000e64 100644
--- a/packages/core/email/admin/src/pages/Settings/tests/index.test.js
+++ b/packages/core/email/admin/src/pages/Settings/tests/index.test.js
@@ -434,7 +434,7 @@ describe('Email | Pages | Settings', () => {
         opacity: 1;
       }
 
-      .c22:disabled {
+      .c22[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -678,9 +678,9 @@ describe('Email | Pages | Settings', () => {
                                 disabled=""
                               >
                                 <input
+                                  aria-disabled="true"
                                   aria-invalid="false"
                                   class="c22"
-                                  disabled=""
                                   id="textinput-3"
                                   name="shipper-email"
                                   placeholder="ex: Strapi No-Reply <no-reply@strapi.io>"
@@ -720,9 +720,9 @@ describe('Email | Pages | Settings', () => {
                                 disabled=""
                               >
                                 <input
+                                  aria-disabled="true"
                                   aria-invalid="false"
                                   class="c22"
-                                  disabled=""
                                   id="textinput-4"
                                   name="response-email"
                                   placeholder="ex: Strapi <example@strapi.io>"
@@ -857,6 +857,7 @@ describe('Email | Pages | Settings', () => {
                                 class="c20 c35"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c22"
                                   id="test-address-input"
diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 8bcad00583..1be028e22b 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -57,8 +57,8 @@
     "@storybook/builder-webpack5": "^6.3.7",
     "@storybook/manager-webpack5": "^6.3.7",
     "@storybook/react": "^6.3.7",
-    "@strapi/icons": "0.0.1-alpha.30",
-    "@strapi/parts": "0.0.1-alpha.30",
+    "@strapi/icons": "0.0.1-alpha.31",
+    "@strapi/parts": "0.0.1-alpha.31",
     "babel-loader": "^8.2.2",
     "cross-env": "^7.0.3",
     "enzyme": "^3.8.0",
diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js b/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js
index 65b1428eb5..bf46ab8188 100644
--- a/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js
+++ b/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js
@@ -59,12 +59,6 @@ describe('', () => {
         padding-left: 40px;
       }
 
-      .c30 {
-        background: #212134;
-        padding: 8px;
-        border-radius: 4px;
-      }
-
       .c1 {
         position: absolute;
         z-index: 3;
@@ -112,31 +106,6 @@ describe('', () => {
         align-items: center;
       }
 
-      .c33 {
-        font-weight: 500;
-        font-size: 0.75rem;
-        line-height: 1.33;
-        color: #ffffff;
-      }
-
-      .c32 {
-        border: 0;
-        -webkit-clip: rect(0 0 0 0);
-        clip: rect(0 0 0 0);
-        height: 1px;
-        margin: -1px;
-        overflow: hidden;
-        padding: 0;
-        position: absolute;
-        width: 1px;
-      }
-
-      .c31 {
-        position: absolute;
-        z-index: 3;
-        display: revert;
-      }
-
       .c9 {
         display: -webkit-box;
         display: -webkit-flex;
@@ -453,28 +422,25 @@ describe('', () => {
                     >
                       Upload assets
                     </h2>
-                    <span>
-                      <button
-                        aria-disabled="false"
-                        aria-labelledby="tooltip-1"
-                        class="c9 c10"
-                        tabindex="0"
-                        type="button"
+                    <button
+                      aria-disabled="false"
+                      aria-label="Close the modal"
+                      class="c9 c10"
+                      type="button"
+                    >
+                      <svg
+                        fill="none"
+                        height="1em"
+                        viewBox="0 0 24 24"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <svg
-                          fill="none"
-                          height="1em"
-                          viewBox="0 0 24 24"
-                          width="1em"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
-                            fill="#212134"
-                          />
-                        </svg>
-                      </button>
-                    </span>
+                        <path
+                          d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
+                          fill="#212134"
+                        />
+                      </svg>
+                    </button>
                   </div>
                 </div>
                 <div
@@ -580,26 +546,6 @@ describe('', () => {
             </div>
           </div>
         </div>
-        <div
-          data-react-portal="true"
-        >
-          <div
-            class="c30 c31"
-            id="tooltip-1"
-            role="tooltip"
-            style="left: 0px; top: -8px;"
-          >
-            <div
-              class="c32"
-              id="description-2"
-            />
-            <p
-              class="c33"
-            >
-              Close the modal
-            </p>
-          </div>
-        </div>
       </body>
     `);
   });
diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js
index 46bb89b45d..f4b75e43e3 100644
--- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js
+++ b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js
@@ -106,7 +106,7 @@ describe('<Input />', () => {
         opacity: 1;
       }
 
-      .c6:disabled {
+      .c6[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -161,6 +161,7 @@ describe('<Input />', () => {
               class="c4 c5"
             >
               <input
+                aria-disabled="false"
                 aria-invalid="false"
                 aria-label="test"
                 class="c6"
diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js
index d7c97f2ed6..1c9e71cf37 100644
--- a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js
+++ b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js
@@ -431,7 +431,7 @@ describe('Admin | containers | RoleEditPage', () => {
         opacity: 1;
       }
 
-      .c25:disabled {
+      .c25[aria-disabled='true'] {
         background: inherit;
         color: inherit;
       }
@@ -771,6 +771,7 @@ describe('Admin | containers | RoleEditPage', () => {
                                 class="c7 c23 c24"
                               >
                                 <input
+                                  aria-disabled="false"
                                   aria-invalid="false"
                                   class="c25"
                                   id="textinput-1"
diff --git a/yarn.lock b/yarn.lock
index bfaeb0ea36..40e25518c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4910,15 +4910,15 @@
     resolve-from "^5.0.0"
     store2 "^2.12.0"
 
-"@strapi/icons@0.0.1-alpha.30":
-  version "0.0.1-alpha.30"
-  resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.30.tgz#e6f50771f4434d22fdbb3453b3afb5af269546b8"
-  integrity sha512-jUJnblvosFuCK69AN/SJvzudKzHO17/t/eph//J6/DUkZV4WHgd62Saj+VNPqnw+x5+AAn7W/tPwurZh8jyUTw==
+"@strapi/icons@0.0.1-alpha.31":
+  version "0.0.1-alpha.31"
+  resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.31.tgz#1d0211211c7720677685599c342e1ee81424b4ca"
+  integrity sha512-A5rBydkUsiYdc0rlzszss5c5cWH44RfLXLDs4J7T+8WRuSVw7xNkLa82cSLgyWKEQKp1DL1V45nAWqM3gByUkQ==
 
-"@strapi/parts@0.0.1-alpha.30":
-  version "0.0.1-alpha.30"
-  resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.30.tgz#39b445e040e109bc535f2e680ea5d9c2740641e4"
-  integrity sha512-lry03GRPOK1OvOjq7+wBzzid01S29yJtpxb70L6/FDPUPeeTK1IuSwrSrvgEU9PTuMhUYPMiPxfQVNH+34jCYw==
+"@strapi/parts@0.0.1-alpha.31":
+  version "0.0.1-alpha.31"
+  resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.31.tgz#ed176bdc93037052d7182e6710fd9bde282f3b61"
+  integrity sha512-/V2nRQJnz1BY+Qrq6rjJtIuff+EgLoVIw3O5tOj8lOMk1QmOU3oqDaTYu8ayu4GKy7gJj1hYaV6oHmTVWu5czQ==
   dependencies:
     "@internationalized/number" "^3.0.2"
     compute-scroll-into-view "^1.0.17"