diff --git a/packages/core/admin/admin/src/components/Roles/RoleForm/RoleForm.js b/packages/core/admin/admin/src/components/Roles/RoleForm/RoleForm.js
index bbc18c2d0b..ba6c9965d8 100644
--- a/packages/core/admin/admin/src/components/Roles/RoleForm/RoleForm.js
+++ b/packages/core/admin/admin/src/components/Roles/RoleForm/RoleForm.js
@@ -48,6 +48,8 @@ const RoleForm = ({ disabled, role, values, errors, onChange, onBlur }) => {
               {formatMessage(
                 {
                   id: 'Settings.roles.form.button.users-with-role',
+                  defaultMessage:
+                    '{number, plural, =0 {# users} one {# user} other {# users}} with this role',
                 },
                 { number: role.usersCount }
               )}
@@ -59,7 +61,10 @@ const RoleForm = ({ disabled, role, values, errors, onChange, onBlur }) => {
                 disabled={disabled}
                 name="name"
                 error={errors.name && formatMessage({ id: errors.name })}
-                label={formatMessage({ id: 'Settings.roles.form.input.name' })}
+                label={formatMessage({
+                  id: 'Settings.roles.form.input.name',
+                  defaultMessage: 'Name',
+                })}
                 onChange={onChange}
                 onBlur={onBlur}
                 value={values.name || ''}
@@ -68,7 +73,10 @@ const RoleForm = ({ disabled, role, values, errors, onChange, onBlur }) => {
             <GridItem col={6}>
               <Textarea
                 disabled={disabled}
-                label={formatMessage({ id: 'Settings.roles.form.input.description' })}
+                label={formatMessage({
+                  id: 'Settings.roles.form.input.description',
+                  defaultMessage: 'Description',
+                })}
                 name="description"
                 error={errors.name && formatMessage({ id: errors.name })}
                 onChange={onChange}
diff --git a/packages/core/admin/admin/src/pages/Roles/EditPage/index.js b/packages/core/admin/admin/src/pages/Roles/EditPage/index.js
index e5e636e673..7e3d48a7f5 100644
--- a/packages/core/admin/admin/src/pages/Roles/EditPage/index.js
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/index.js
@@ -1,4 +1,10 @@
-import { request, useNotification, useOverlayBlocker, useTracking } from '@strapi/helper-plugin';
+import {
+  request,
+  useNotification,
+  useOverlayBlocker,
+  useTracking,
+  LoadingIndicatorPage,
+} from '@strapi/helper-plugin';
 import { Box, Button, HeaderLayout, Main, Stack, ContentLayout } from '@strapi/parts';
 import { Formik } from 'formik';
 import get from 'lodash/get';
@@ -140,7 +146,7 @@ const EditPage = () => {
                   onBlur={handleBlur}
                   role={role}
                 />
-                {!isLayoutLoading && !isRoleLoading && (
+                {!isLayoutLoading && !isRoleLoading ? (
                   <Box paddingTop={6} paddingBottom={6}>
                     <Permissions
                       isFormDisabled={isFormDisabled}
@@ -149,6 +155,8 @@ const EditPage = () => {
                       layout={permissionsLayout}
                     />
                   </Box>
+                ) : (
+                  <LoadingIndicatorPage />
                 )}
               </ContentLayout>
             </>
diff --git a/packages/core/admin/admin/src/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap
new file mode 100644
index 0000000000..5890c294d0
--- /dev/null
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/tests/__snapshots__/index.test.js.snap
@@ -0,0 +1,756 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<EditPage /> renders and matches the snapshot 1`] = `
+.c31 {
+  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;
+}
+
+.c5 {
+  font-weight: 600;
+  font-size: 2rem;
+  line-height: 1.25;
+  color: #32324d;
+}
+
+.c10 {
+  font-weight: 500;
+  font-size: 0.75rem;
+  line-height: 1.33;
+  color: #32324d;
+}
+
+.c12 {
+  font-weight: 400;
+  font-size: 0.875rem;
+  line-height: 1.43;
+  color: #666687;
+}
+
+.c17 {
+  font-weight: 500;
+  font-size: 0.875rem;
+  line-height: 1.43;
+  color: #32324d;
+}
+
+.c18 {
+  font-weight: 400;
+  font-size: 0.75rem;
+  line-height: 1.33;
+  color: #8e8ea9;
+}
+
+.c13 {
+  font-size: 1rem;
+  line-height: 1.5;
+}
+
+.c2 {
+  background: #f6f6f9;
+  padding-top: 56px;
+  padding-right: 56px;
+  padding-bottom: 56px;
+  padding-left: 56px;
+}
+
+.c14 {
+  padding-right: 56px;
+  padding-left: 56px;
+}
+
+.c15 {
+  background: #ffffff;
+  padding: 24px;
+  border-radius: 4px;
+  box-shadow: 0px 1px 4px rgba(33,33,52,0.1);
+}
+
+.c3 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c4 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c7 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  cursor: pointer;
+  padding: 8px;
+  border-radius: 4px;
+  background: #ffffff;
+  border: 1px solid #dcdce4;
+}
+
+.c7 svg {
+  height: 12px;
+  width: 12px;
+}
+
+.c7 svg > g,
+.c7 svg path {
+  fill: #ffffff;
+}
+
+.c7[aria-disabled='true'] {
+  pointer-events: none;
+}
+
+.c8 {
+  padding: 8px 16px;
+  background: #4945ff;
+  border: none;
+  border: 1px solid #d9d8ff;
+  background: #f0f0ff;
+}
+
+.c8 .c1 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c8 .c9 {
+  color: #ffffff;
+}
+
+.c8[aria-disabled='true'] {
+  border: 1px solid #dcdce4;
+  background: #eaeaef;
+}
+
+.c8[aria-disabled='true'] .c9 {
+  color: #666687;
+}
+
+.c8[aria-disabled='true'] svg > g,
+.c8[aria-disabled='true'] svg path {
+  fill: #666687;
+}
+
+.c8[aria-disabled='true']:active {
+  border: 1px solid #dcdce4;
+  background: #eaeaef;
+}
+
+.c8[aria-disabled='true']:active .c9 {
+  color: #666687;
+}
+
+.c8[aria-disabled='true']:active svg > g,
+.c8[aria-disabled='true']:active svg path {
+  fill: #666687;
+}
+
+.c8:hover {
+  background-color: #ffffff;
+}
+
+.c8:active {
+  background-color: #ffffff;
+  border: 1px solid #4945ff;
+}
+
+.c8:active .c9 {
+  color: #4945ff;
+}
+
+.c8:active svg > g,
+.c8:active svg path {
+  fill: #4945ff;
+}
+
+.c8 .c9 {
+  color: #271fe0;
+}
+
+.c8 svg > g,
+.c8 svg path {
+  fill: #271fe0;
+}
+
+.c11 {
+  padding: 8px 16px;
+  background: #4945ff;
+  border: none;
+  border: 1px solid #4945ff;
+  background: #4945ff;
+}
+
+.c11 .c1 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c11 .c9 {
+  color: #ffffff;
+}
+
+.c11[aria-disabled='true'] {
+  border: 1px solid #dcdce4;
+  background: #eaeaef;
+}
+
+.c11[aria-disabled='true'] .c9 {
+  color: #666687;
+}
+
+.c11[aria-disabled='true'] svg > g,
+.c11[aria-disabled='true'] svg path {
+  fill: #666687;
+}
+
+.c11[aria-disabled='true']:active {
+  border: 1px solid #dcdce4;
+  background: #eaeaef;
+}
+
+.c11[aria-disabled='true']:active .c9 {
+  color: #666687;
+}
+
+.c11[aria-disabled='true']:active svg > g,
+.c11[aria-disabled='true']:active svg path {
+  fill: #666687;
+}
+
+.c11:hover {
+  border: 1px solid #7b79ff;
+  background: #7b79ff;
+}
+
+.c11:active {
+  border: 1px solid #4945ff;
+  background: #4945ff;
+}
+
+.c16 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+.c16 > * {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.c16 > * + * {
+  margin-top: 16px;
+}
+
+.c23 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+.c23 > * {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.c23 > * + * {
+  margin-top: 4px;
+}
+
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+}
+
+.c6 > * {
+  margin-left: 0;
+  margin-right: 0;
+}
+
+.c6 > * + * {
+  margin-left: 8px;
+}
+
+.c25 {
+  border: none;
+  padding-left: 16px;
+  padding-right: 16px;
+  color: #32324d;
+  font-weight: 400;
+  font-size: 0.875rem;
+  display: block;
+  width: 100%;
+  height: 2.5rem;
+}
+
+.c25::-webkit-input-placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c25::-moz-placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c25:-ms-input-placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c25::placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c25:disabled {
+  background: inherit;
+  color: inherit;
+}
+
+.c25:focus {
+  outline: none;
+}
+
+.c24 {
+  border: 1px solid #dcdce4;
+  border-radius: 4px;
+  background: #ffffff;
+  overflow: hidden;
+}
+
+.c24:focus-within {
+  border: 1px solid #4945ff;
+}
+
+.c22 textarea {
+  height: 5rem;
+}
+
+.c20 {
+  display: grid;
+  grid-template-columns: repeat(12,1fr);
+  gap: 16px;
+}
+
+.c21 {
+  grid-column: span 6;
+  word-break: break-all;
+}
+
+.c0 {
+  outline: none;
+}
+
+.c27 {
+  display: block;
+  width: 100%;
+  border: 1px solid #dcdce4;
+  border-radius: 4px;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  font-weight: 400;
+  font-size: 0.875rem;
+  color: #32324d;
+  background: #ffffff;
+  outline: none;
+}
+
+.c27:focus {
+  border: 1px solid #4945ff;
+}
+
+.c27::-webkit-input-placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c27::-moz-placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c27:-ms-input-placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c27::placeholder {
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c26 textarea {
+  height: 5rem;
+  line-height: 1.25rem;
+  font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans', 'Helvetica Neue',sans-serif;
+}
+
+.c26 textarea::-webkit-input-placeholder {
+  font-weight: 400;
+  font-size: 0.875rem;
+  line-height: 1.43;
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c26 textarea::-moz-placeholder {
+  font-weight: 400;
+  font-size: 0.875rem;
+  line-height: 1.43;
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c26 textarea:-ms-input-placeholder {
+  font-weight: 400;
+  font-size: 0.875rem;
+  line-height: 1.43;
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c26 textarea::placeholder {
+  font-weight: 400;
+  font-size: 0.875rem;
+  line-height: 1.43;
+  color: #8e8ea9;
+  opacity: 1;
+}
+
+.c29 {
+  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;
+}
+
+.c30 {
+  -webkit-animation: gzYjWD 1s infinite linear;
+  animation: gzYjWD 1s infinite linear;
+}
+
+.c28 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-box-pack: space-around;
+  -webkit-justify-content: space-around;
+  -ms-flex-pack: space-around;
+  justify-content: space-around;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c19 {
+  border: 1px solid #d9d8ff;
+  background: #f0f0ff;
+  padding: 8px 16px;
+  color: #4945ff;
+  border-radius: 4px;
+  font-size: 0.75rem;
+  font-width: bold;
+}
+
+@media (max-width:68.75rem) {
+  .c21 {
+    grid-column: span;
+  }
+}
+
+@media (max-width:34.375rem) {
+  .c21 {
+    grid-column: span;
+  }
+}
+
+<div>
+  <main
+    aria-labelledby="title"
+    class="c0"
+    id="main-content"
+    tabindex="-1"
+  >
+    <form>
+      <div
+        class="c1 "
+      >
+        <div
+          class="c1 c2"
+          data-strapi-header="true"
+        >
+          <div
+            class="c1 c3"
+          >
+            <div
+              class="c1 c4"
+            >
+              <h1
+                class="c5"
+                id="title"
+              >
+                Edit a role
+              </h1>
+            </div>
+            <div
+              class="c6"
+            >
+              <button
+                aria-disabled="false"
+                class="c7 c8"
+                type="button"
+              >
+                <span
+                  class="c9 c10"
+                >
+                  Reset
+                </span>
+              </button>
+              <button
+                aria-disabled="false"
+                class="c7 c11"
+                type="button"
+              >
+                <span
+                  class="c9 c10"
+                >
+                  Save
+                </span>
+              </button>
+            </div>
+          </div>
+          <p
+            class="c9 c12 c13"
+          >
+            Define the rights given to the role
+          </p>
+        </div>
+      </div>
+      <div
+        class="c1 c14"
+      >
+        <div
+          class="c1 c15"
+        >
+          <div
+            class="c16"
+          >
+            <div
+              class="c1 c3"
+            >
+              <div
+                class="c1 "
+              >
+                <div
+                  class="c1 "
+                >
+                  <span
+                    class="c9 c17"
+                  />
+                </div>
+                <div
+                  class="c1 "
+                >
+                  <span
+                    class="c9 c18"
+                  />
+                </div>
+              </div>
+              <div
+                class="c19"
+              >
+                NaN users with this role
+              </div>
+            </div>
+            <div
+              class="c1 c20"
+            >
+              <div
+                class="c21"
+              >
+                <div
+                  class="c1 "
+                >
+                  <div
+                    class="c22"
+                  >
+                    <div>
+                      <div
+                        class="c23"
+                      >
+                        <div
+                          class="c1 c4"
+                        >
+                          <label
+                            class="c9 c10"
+                            for="textinput-1"
+                          >
+                            Name
+                          </label>
+                        </div>
+                        <div
+                          class="c1 c3 c24"
+                        >
+                          <input
+                            aria-invalid="false"
+                            class="c25"
+                            id="textinput-1"
+                            name="name"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="c21"
+              >
+                <div
+                  class="c1 "
+                >
+                  <div
+                    class="c26"
+                  >
+                    <div>
+                      <div
+                        class="c23"
+                      >
+                        <div
+                          class="c1 c4"
+                        >
+                          <label
+                            class="c9 c10"
+                            for="textarea-2"
+                          >
+                            Description
+                          </label>
+                        </div>
+                        <textarea
+                          aria-invalid="false"
+                          class="c27"
+                          id="textarea-2"
+                          name="description"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="c28"
+          data-testid="loader"
+        >
+          <div
+            aria-live="assertive"
+            role="alert"
+          >
+            <div
+              class="c29"
+            >
+              Loading content.
+            </div>
+            <img
+              aria-hidden="true"
+              class="c30"
+              src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjMiIGhlaWdodD0iNjMiIHZpZXdCb3g9IjAgMCA2MyA2MyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQyLjU1NjMgMTEuOTgxNkMzOS40ODQgMTAuMzA3MSAzNS44NTc1IDkuMjkwOTcgMzIuMzM1NCA5LjEzNTIxQzI4LjY0NDMgOC45Mjg4OCAyNC44Mjk1IDkuNzIzMTggMjEuMzMzNiAxMS40MTI5QzIwLjkxMjMgMTEuNTkwMSAyMC41Mzc2IDExLjgxMDEgMjAuMTcyMiAxMi4wMjQ5TDIwLjAxMDggMTIuMTE3OUMxOS44Nzc0IDEyLjE5NTEgMTkuNzQ0MSAxMi4yNzI0IDE5LjYwOCAxMi4zNTM2QzE5LjMyNTMgMTIuNTE0NiAxOS4wNDkyIDEyLjY3NDQgMTguNzU0NCAxMi44NzkyQzE4LjU0NjMgMTMuMDMyOSAxOC4zMzk1IDEzLjE3NTkgMTguMTMwMSAxMy4zMjNDMTcuNTY1OCAxMy43MjA4IDE2Ljk4NjggMTQuMTMxNyAxNi40OTgzIDE0LjU5NzlDMTQuODQ3NiAxNS45NTI0IDEzLjU1NzEgMTcuNjA3NSAxMi42MDcxIDE4LjkyMTRDMTAuNDM2NSAyMi4xNTY2IDkuMDg2MjIgMjUuOTU2NyA4LjgwNzAyIDI5LjYxNDNMOC43NzY0IDMwLjE1ODhDOC43MzMyOCAzMC45MTk2IDguNjg0NzYgMzEuNzA1NyA4Ljc1MzUzIDMyLjQ1NTVDOC43NjY0OCAzMi42MDg0IDguNzY2MSAzMi43NjM4IDguNzc1MDYgMzIuOTE0QzguNzg4OTUgMzMuMjI5IDguODAxNTIgMzMuNTM3MyA4Ljg0NiAzMy44NjcyTDkuMDczOTYgMzUuNDIyMUM5LjA5NzU2IDM1LjU3NjQgOS4xMTk4IDM1Ljc0MTMgOS4xNjMzIDM1LjkyNjNMOS42NTkxOSAzNy45MjcyTDEwLjEzOCAzOS4yODIzQzEwLjI3MjkgMzkuNjY3MyAxMC40MTU4IDQwLjA3NTEgMTAuNiA0MC40M0MxMi4wMjkyIDQzLjYzNyAxNC4xNDI1IDQ2LjQ1NzggMTYuNzA2MyA0OC41ODVDMTkuMDUwOCA1MC41Mjk2IDIxLjgyNCA1Mi4wMDIzIDI0Ljc0OTEgNTIuODQ1MkwyNi4yMzcxIDUzLjIzNzZDMjYuMzc4MSA1My4yNjkzIDI2LjQ5MjYgNTMuMjg4OSAyNi42MDMxIDUzLjMwNThMMjYuNzc3NSA1My4zMzExQzI3LjAwNTIgNTMuMzYzNiAyNy4yMTk1IDUzLjM5ODYgMjcuNDQ0NSA1My40MzVDMjcuODU5OCA1My41MDc2IDI4LjI2NzIgNTMuNTc0OCAyOC43MDc5IDUzLjYxODNMMzAuNTY0MSA1My43MjI5QzMwLjk1MTYgNTMuNzI0OSAzMS4zMzUyIDUzLjcwNjggMzEuNzA4MSA1My42ODc0QzMxLjkwMzkgNTMuNjgxIDMyLjA5ODQgNTMuNjY4MSAzMi4zMjg4IDUzLjY2MkMzNC41MjUzIDUzLjQ3NzIgMzYuNTEwNiA1My4wNjM0IDM4LjA1MTYgNTIuNDY1MkMzOC4xNzY5IDUyLjQxNzEgMzguMzAwOCA1Mi4zNzk2IDM4LjQyMzQgNTIuMzM1NUMzOC42NzI3IDUyLjI0OTkgMzguOTI1OSA1Mi4xNjcgMzkuMTQzMiA1Mi4wNTk5TDQwLjg1OTEgNTEuMjYyNkw0Mi41NzAyIDUwLjI2NkM0Mi45MDA5IDUwLjA2ODIgNDMuMDIwNSA0OS42NDE0IDQyLjgyODIgNDkuMjk4NEM0Mi42MzIgNDguOTUyNiA0Mi4yMDM0IDQ4LjgzMDggNDEuODYzNCA0OS4wMTY2TDQwLjE3OTIgNDkuOTIxOEwzOC40OTk1IDUwLjYyMjRDMzguMzE2OSA1MC42OTUzIDM4LjEyMSA1MC43NTM0IDM3LjkyMjQgNTAuODE1NUMzNy43ODM4IDUwLjg0ODkgMzcuNjUxOCA1MC44OTgzIDM3LjUwMTIgNTAuOTQwOEMzNi4wNzExIDUxLjQzNSAzNC4yNDQ1IDUxLjc0MjUgMzIuMjQ0IDUxLjgzNDZDMzIuMDQ0MiA1MS44MzgzIDMxLjg0NzEgNTEuODM3OSAzMS42NTQgNTEuODQwM0MzMS4zMDUxIDUxLjg0MTQgMzAuOTYwMiA1MS44NDUxIDMwLjYzOTIgNTEuODMwNUwyOC45MTc3IDUxLjY3MjVDMjguNTQ3NiA1MS42MTkgMjguMTY5NSA1MS41NDI3IDI3Ljc4NDggNTEuNDY3OEMyNy41NjM5IDUxLjQxNjcgMjcuMzM3NiA1MS4zNzM3IDI3LjEyOTkgNTEuMzM3NEwyNi45NTI5IDUxLjI5ODdDMjYuODcwNCA1MS4yODM0IDI2Ljc3NzIgNTEuMjY2NyAyNi43MzMzIDUxLjI1NDNMMjUuMzQ2NiA1MC44MzIyQzIyLjc2NTEgNDkuOTc4OSAyMC4zMyA0OC41NzI5IDE4LjI5NDIgNDYuNzU1N0MxNi4xMDU2IDQ0Ljc5NTEgMTQuMzMzOSA0Mi4yMzM1IDEzLjE3NDIgMzkuMzU4MkMxMi4wMjc2IDM2LjYwMTMgMTEuNTk4OCAzMy4yNzkyIDExLjk3MTYgMzAuMDA3NkMxMi4zMTQ1IDI3LjAyMTMgMTMuMzk0OCAyNC4xNjM1IDE1LjE4NTggMjEuNTA4M0MxNS4zMDM0IDIxLjMzMzkgMTUuNDIxIDIxLjE1OTYgMTUuNTIxMiAyMS4wMTk2QzE2LjQzMDkgMTkuODY4OCAxNy41NDA4IDE4LjU1ODkgMTguOTQ4MyAxNy40OTZDMTkuMzM2NyAxNy4xNTI1IDE5Ljc4NjIgMTYuODU2IDIwLjI2MTEgMTYuNTQ3OEMyMC40ODc4IDE2LjQwMDkgMjAuNzA3OSAxNi4yNTUzIDIwLjg5MDcgMTYuMTMwNkMyMS4wOTc0IDE2LjAwNDggMjEuMzE4OCAxNS44ODMxIDIxLjUzNDggMTUuNzY5NEMyMS42NzYxIDE1LjY5NzUgMjEuODE2MiAxNS42MTkgMjEuOTM4OCAxNS41NTc2TDIyLjEwMDIgMTUuNDY0NkMyMi40MDAyIDE1LjMwMzcgMjIuNjc0OSAxNS4xNTQ2IDIyLjk5MDggMTUuMDM5TDI0LjExODYgMTQuNTcxNUMyNC4zMzk5IDE0LjQ4NDQgMjQuNTcxOCAxNC40MTU5IDI0Ljc5OTcgMTQuMzQ0N0MyNC45NTMgMTQuMjk4MiAyNS4wOTgyIDE0LjI2MzUgMjUuMjYzNSAxNC4yMDc4QzI1Ljc4NiAxNC4wMTgyIDI2LjMyODMgMTMuOTExMiAyNi45MTA1IDEzLjc5NjVDMjcuMTE3IDEzLjc1NzEgMjcuMzMwMiAxMy43MTYzIDI3LjU2MDggMTMuNjU4NUMyNy43NTUzIDEzLjYxMSAyNy45NzM3IDEzLjU5NjkgMjguMjA4MiAxMy41NzYyQzI4LjM2NCAxMy41NjAzIDI4LjUxNzIgMTMuNTQ4MyAyOC42MzE4IDEzLjUzMzNDMjguNzg3NiAxMy41MTczIDI4LjkzNDIgMTMuNTA2NiAyOS4wOTI3IDEzLjQ4NjdDMjkuMzI4NSAxMy40NTU1IDI5LjU0NTYgMTMuNDM0NyAyOS43NDk0IDEzLjQzMzdDMzAuMDIzNyAxMy40NCAzMC4yOTk0IDEzLjQzNTcgMzAuNTc3NyAxMy40Mjc0QzMxLjA4MTEgMTMuNDIxIDMxLjU1NzkgMTMuNDE5NyAzMi4wMzE4IDEzLjQ5MTRDMzQuOTY2NCAxMy43MzUyIDM3LjcxNDQgMTQuNjA4NSA0MC4yMDUyIDE2LjA4NjhDNDIuMzQ4OSAxNy4zNjU1IDQ0LjI3MTYgMTkuMTUyNSA0NS43NjA3IDIxLjI2NEM0Ny4wMjU1IDIzLjA2MjggNDcuOTc1NiAyNS4wNTI4IDQ4LjQ5MjggMjcuMDM5M0M0OC41NzIgMjcuMzE3NiA0OC42Mjk5IDI3LjU5MzEgNDguNjgzOSAyNy44NjU5QzQ4LjcxNTQgMjguMDQyOCA0OC43NTYzIDI4LjIxNDUgNDguNzg5MiAyOC4zNjM2QzQ4LjgwMzcgMjguNDU0MSA0OC44MjA4IDI4LjU0MDYgNDguODQ0NSAyOC42MjU4QzQ4Ljg3NDkgMjguNzQ0MyA0OC44OTg2IDI4Ljg2NCA0OC45MTE2IDI4Ljk2NTFMNDguOTc5MyAyOS42MDQ3QzQ4Ljk5MjIgMjkuNzc0OCA0OS4wMTMyIDI5LjkzMzEgNDkuMDMwMSAzMC4wODg3QzQ5LjA2NjggMzAuMzI2OCA0OS4wODg5IDMwLjU2MDggNDkuMDk2NCAzMC43NTYxTDQ5LjEwODMgMzEuOTAwMUM0OS4xMzEyIDMyLjMzMDcgNDkuMDg5IDMyLjcxMTYgNDkuMDUyMiAzMy4wNjczQzQ5LjAzODQgMzMuMjU5OCA0OS4wMTI2IDMzLjQ0NDMgNDkuMDEyMyAzMy41ODI0QzQ4Ljk5NjEgMzMuNjkyNiA0OC45OTE4IDMzLjc5MzUgNDguOTgzNiAzMy44OTE3QzQ4Ljk3NTMgMzQuMDA3MiA0OC45NzI0IDM0LjExNDggNDguOTQxNCAzNC4yNTU0TDQ4LjU0NDkgMzYuMzA1OUM0OC4zMTM0IDM3Ljg2MjMgNDkuMzc5MyAzOS4zMzY1IDUwLjk0ODggMzkuNTgyMkM1Mi4wNDE3IDM5Ljc2MDEgNTMuMTUzNiAzOS4yODE5IDUzLjc3MTEgMzguMzY2NEM1NC4wMDYzIDM4LjAxNzYgNTQuMTYwNCAzNy42MjU3IDU0LjIyMjcgMzcuMjA2NEw1NC41MjE3IDM1LjI1NzRDNTQuNTUxNCAzNS4wNzU2IDU0LjU3MiAzNC44MyA1NC41ODQ2IDM0LjU3OTFMNTQuNjAyOCAzNC4yMzM4QzU0LjYwOTggMzQuMDU5OCA1NC42MjIzIDMzLjg3NzkgNTQuNjM0NyAzMy42Nzg4QzU0LjY3MzQgMzMuMTA1MiA1NC43MTYzIDMyLjQ0NzkgNTQuNjYxOSAzMS44MDU4TDU0LjU4NjcgMzAuNDI4OUM1NC41NjIyIDMwLjA5NTIgNTQuNTA5NyAyOS43NiA1NC40NTU5IDI5LjQxODFDNTQuNDMxIDI5LjI1NzIgNTQuNDA0OCAyOS4wODk2IDU0LjM4MjYgMjguOTA3NEw1NC4yNjg3IDI4LjEwNEM1NC4yMzMyIDI3LjkyNDQgNTQuMTgwNCAyNy43MjczIDU0LjEzMjkgMjcuNTM5Nkw1NC4wNjQzIDI3LjI0NTRDNTQuMDE5NSAyNy4wNzEgNTMuOTc3MyAyNi44OTI3IDUzLjkzMzggMjYuNzA3NkM1My44NDU1IDI2LjMzMDkgNTMuNzQ3OSAyNS45NDIyIDUzLjYxMyAyNS41NTcxQzUyLjg0IDIzLjAyOTIgNTEuNTM4MyAyMC41MTk0IDQ5LjgzMzggMTguMjc5OUM0Ny44NTQ0IDE1LjY4MiA0NS4zMzMzIDEzLjUwODcgNDIuNTU2MyAxMS45ODE2WiIgZmlsbD0iIzQ5NDVGRiIvPgo8L3N2Zz4K"
+            />
+          </div>
+        </div>
+      </div>
+    </form>
+  </main>
+  <div
+    class="c31"
+  >
+    <p
+      aria-live="polite"
+      id="live-region-log"
+      role="log"
+    />
+    <p
+      aria-live="polite"
+      id="live-region-status"
+      role="status"
+    />
+    <p
+      aria-live="assertive"
+      id="live-region-alert"
+      role="alert"
+    />
+  </div>
+</div>
+`;
diff --git a/packages/core/admin/admin/src/pages/Roles/EditPage/tests/index.test.js b/packages/core/admin/admin/src/pages/Roles/EditPage/tests/index.test.js
new file mode 100644
index 0000000000..907a9d71a4
--- /dev/null
+++ b/packages/core/admin/admin/src/pages/Roles/EditPage/tests/index.test.js
@@ -0,0 +1,64 @@
+/**
+ *
+ * Tests for EditPage
+ *
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { IntlProvider } from 'react-intl';
+import { Router, Switch, Route } from 'react-router';
+import { createMemoryHistory } from 'history';
+import moment from 'moment';
+import Theme from '../../../../components/Theme';
+
+import EditPage from '../index';
+
+jest.mock('moment', () => {
+  const mMoment = {
+    format: jest.fn().mockReturnThis(),
+    valueOf: jest.fn(),
+  };
+
+  return jest.fn(() => mMoment);
+});
+
+jest.mock('@strapi/helper-plugin', () => ({
+  ...jest.requireActual('@strapi/helper-plugin'),
+  useNotification: jest.fn(() => jest.fn()),
+  useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn(), unlockApp: jest.fn() })),
+  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
+}));
+
+const makeApp = history => (
+  <IntlProvider
+    messages={{ en: { 'Settings.roles.form.created': 'created' } }}
+    textComponent="span"
+    locale="en"
+  >
+    <Theme>
+      <Router history={history}>
+        <Switch>
+          <Route path="/settings/roles/:id">
+            <EditPage />
+          </Route>
+        </Switch>
+      </Router>
+    </Theme>
+  </IntlProvider>
+);
+
+describe('<EditPage />', () => {
+  it('renders and matches the snapshot', () => {
+    moment()
+      .format.mockReturnValueOnce('2021–01–30T12:34:56+00:00')
+      .mockReturnValueOnce('01–30-2021');
+    const history = createMemoryHistory();
+    const App = makeApp(history);
+    const { container } = render(App);
+
+    history.push('/settings/roles/1');
+
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index c962d23bf5..4655645b85 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.7",
-    "@strapi/icons": "0.0.1-alpha.15",
-    "@strapi/parts": "0.0.1-alpha.15",
+    "@strapi/icons": "0.0.1-alpha.16",
+    "@strapi/parts": "0.0.1-alpha.16",
     "@strapi/utils": "3.6.7",
     "axios": "^0.21.1",
     "babel-loader": "8.2.2",
diff --git a/yarn.lock b/yarn.lock
index acd6ead65b..1e65b4ea86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4079,7 +4079,6 @@
     tslib "^2.0.0"
     upath "2.0.1"
 
-<<<<<<< HEAD
 "@storybook/addon-actions@6.3.7", "@storybook/addon-actions@^6.3.7":
   version "6.3.7"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.3.7.tgz#b25434972bef351aceb3f7ec6fd66e210f256aac"
@@ -4916,13 +4915,16 @@
     resolve-from "^5.0.0"
     store2 "^2.12.0"
 
-=======
->>>>>>> ade0a8767 (Fix conflicts with yarn lock)
 "@strapi/icons@0.0.1-alpha.15":
   version "0.0.1-alpha.15"
   resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.15.tgz#32fc824b732b4a21d5282f84696d6207ac5cbea1"
   integrity sha512-FIczXDSEBPXTfptgqR6Hjh65Fpf4XF+kEm3o53PQX8G0GZ0Udpcbspqf2Kieeocg8TePgRkTI/oU6KS1aJbXrg==
 
+"@strapi/icons@0.0.1-alpha.16":
+  version "0.0.1-alpha.16"
+  resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.16.tgz#0906c0c36b1f27b46ba9f3011216cb63671839eb"
+  integrity sha512-6veZv8rnX+IVZUf5Di3CSQYgjaUEJiJ6CuE03HSi5R3MixsHUXc3Q/7R4oj+U6eswz/FIaSRcJcPCJ0pw4Dm8g==
+
 "@strapi/parts@0.0.1-alpha.15":
   version "0.0.1-alpha.15"
   resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.15.tgz#250cc29be0fa4cc2b91c8c0be49e1c2070a25450"
@@ -4932,6 +4934,15 @@
     compute-scroll-into-view "^1.0.17"
     prop-types "^15.7.2"
 
+"@strapi/parts@0.0.1-alpha.16":
+  version "0.0.1-alpha.16"
+  resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.16.tgz#afb9b6c269a8afdfb1ea324dc9f56ee94f1ab985"
+  integrity sha512-KBK/JrhFLgicmRmqMjzP1eSWu4+UN0EA4Hz203tmaNs+U6sZHzsygQ2yVYFfNd2MuIkiimeW8WwMwT+QLhiw+A==
+  dependencies:
+    "@internationalized/number" "^3.0.2"
+    compute-scroll-into-view "^1.0.17"
+    prop-types "^15.7.2"
+
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"
   resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"