diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
index 11c58632c3..1e3abf69e3 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
@@ -5,9 +5,10 @@ import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 
 import ConditionsSelect from '../ConditionsSelect';
+import { rowHeight } from '../../Permissions/utils/constants';
 
 const RowWrapper = styled(Row)`
-  height: ${52 / 16}rem;
+  height: ${rowHeight};
 `;
 
 const ActionRow = ({
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js b/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js
index 6d08be97ca..5ce04db8aa 100644
--- a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js
@@ -9,7 +9,7 @@ import { usePermissionsDataManager } from '../../../../hooks';
 import ConditionsButton from '../../ConditionsButton';
 import ConditionsModal from '../../ConditionsModal';
 import HiddenAction from '../../HiddenAction';
-import { cellWidth } from '../../Permissions/utils/constants';
+import { cellWidth, rowHeight } from '../../Permissions/utils/constants';
 import RowLabelWithCheckbox from '../../RowLabelWithCheckbox';
 import { getCheckboxState } from '../../utils';
 import generateCheckboxesActions from './utils/generateCheckboxesActions';
@@ -34,7 +34,7 @@ const activeRowStyle = (theme, isActive, isClicked) => `
 const Wrapper = styled.div`
   display: flex;
   align-items: center;
-  height: ${52 / 16}rem;
+  height: ${rowHeight};
   background-color: ${({ isGrey, theme }) =>
     isGrey ? theme.colors.neutral100 : theme.colors.neutral0};
   border: 1px solid transparent;
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js b/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
index bc9ef197ff..c741b597b5 100644
--- a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js
@@ -6,7 +6,7 @@ import React, { memo, useCallback, useMemo, useState } from 'react';
 import styled from 'styled-components';
 import { usePermissionsDataManager } from '../../../../../hooks';
 import HiddenAction from '../../../HiddenAction';
-import { cellWidth } from '../../../Permissions/utils/constants';
+import { cellWidth, rowHeight } from '../../../Permissions/utils/constants';
 import RequiredSign from '../../../RequiredSign';
 import RowLabelWithCheckbox from '../../../RowLabelWithCheckbox';
 import { getCheckboxState } from '../../../utils';
@@ -21,7 +21,7 @@ const Cell = styled(Row)`
 `;
 
 const Wrapper = styled(Row)`
-  height: ${52 / 16}rem;
+  height: ${rowHeight};
   flex: 1;
 
   ${({ isCollapsable, theme }) =>
diff --git a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js b/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js
index ef11f70151..aa66456bc0 100644
--- a/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { Row, TableLabel } from '@strapi/parts';
 import styled from 'styled-components';
-import { cellWidth, firstRowWidth } from '../../../Permissions/utils/constants';
+import { cellWidth, firstRowWidth, rowHeight } from '../../../Permissions/utils/constants';
 
 const HeaderLabel = styled(Row)`
   width: ${cellWidth};
@@ -11,7 +11,7 @@ const HeaderLabel = styled(Row)`
 `;
 const PropertyLabelWrapper = styled(Row)`
   width: ${firstRowWidth};
-  height: ${52 / 16}rem;
+  height: ${rowHeight};
   flex-shrink: 0;
 `;
 
diff --git a/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js b/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
index c1a1fff5af..3fa5c3f800 100644
--- a/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
+++ b/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
@@ -235,7 +235,14 @@ const CreatePage = () => {
                       />
                     </Box>
                   ) : (
-                    <Row alignItems="center" justifyContent="center" padding={11}>
+                    <Row
+                      alignItems="center"
+                      justifyContent="center"
+                      padding={11}
+                      background="neutral0"
+                      shadow="filterShadow"
+                      hasRadius
+                    >
                       <Loader />
                     </Row>
                   )}