diff --git a/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js b/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js
index caf9fe8d80..900f25b483 100644
--- a/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js
+++ b/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js
@@ -4,7 +4,9 @@ const getStep = type => {
   if (type === 'float' || type === 'decimal') {
     step = 0.01;
   } else if (type === 'time' || type === 'datetime') {
-    step = 30;
+    // Since we cannot set a value that is not in the list of the time picker, we need to set the step to 1
+    // TODO: Fix the timepicker in order to be able to set any value regardless of the list
+    step = 1;
   } else {
     step = 1;
   }
diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js
index 1d1b514336..505ee66332 100644
--- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js
+++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js
@@ -21,7 +21,7 @@ const DropdownIconWrapper = styled(Box)`
     height: ${6 / 16}rem;
     width: ${11 / 16}rem;
     > path {
-      fill: ${({ theme }) => theme.colors.primary600};
+      fill: ${({ theme }) => theme.colors.neutral600};
     }
   }
 `;
@@ -43,17 +43,17 @@ const DragPreview = ({ displayedValue }) => {
       paddingTop={3}
       paddingBottom={3}
       hasRadius
-      background="primary100"
+      background="neutral0"
       style={{ width: '20vw' }}
     >
       <Row justifyContent="space-between">
         <ToggleButton type="button">
           <Row>
-            <DropdownIconWrapper background="primary200">
+            <DropdownIconWrapper background="neutral200">
               <DropdownIcon />
             </DropdownIconWrapper>
             <Box paddingLeft={6}>
-              <Text textColor="primary700" style={{ width: '9vw' }} ellipsis>
+              <Text textColor="neutral700" style={{ width: '9vw' }} ellipsis>
                 {displayedValue}
               </Text>
             </Box>
diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js
index 0791ebe011..db1cc0479f 100644
--- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js
+++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js
@@ -1,14 +1,19 @@
 import React from 'react';
+import styled from 'styled-components';
 import { Box } from '@strapi/parts/Box';
 import { Row } from '@strapi/parts/Row';
 
+const StyledBox = styled(Box)`
+  border: 1px dashed ${({ theme }) => theme.colors.primary500};
+`;
+
 const Preview = () => {
   return (
-    <Box padding={6}>
-      <Box background="primary600" paddingTop={2}>
+    <StyledBox padding={8} background="primary100">
+      <Box>
         <Row />
       </Box>
-    </Box>
+    </StyledBox>
   );
 };
 
diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js
index af2cc23fa2..b1057cd971 100644
--- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js
@@ -44,6 +44,7 @@ const DraggedItem = ({
   // hasErrors,
   // hasMinError,
   // isFirst,
+
   isOdd,
   isOpen,
   isReadOnly,
diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js
index 9e1f8a18eb..47da735046 100644
--- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js
@@ -253,6 +253,9 @@ RepeatableComponent.propTypes = {
 
 const Memoized = memo(RepeatableComponent);
 
-export default connect(Memoized, select);
+export default connect(
+  Memoized,
+  select
+);
 
 export { RepeatableComponent };
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js
index da46dd0a93..d499f508ca 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js
@@ -89,9 +89,7 @@ const ForgotPassword = ({ onSubmit, schema }) => {
         <Row justifyContent="center">
           <Box paddingTop={4}>
             <Link to="/auth/login">
-              <Text small>
-                {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
-              </Text>
+              {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
             </Link>
           </Box>
         </Row>
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js
index 67e8d8c295..8514974026 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js
@@ -48,7 +48,7 @@ const ForgotPasswordSuccess = () => {
         <Row justifyContent="center">
           <Box paddingTop={4}>
             <Link to="/auth/login">
-              <Text>{formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}</Text>
+              {formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}
             </Link>
           </Box>
         </Row>
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js
index 12e2a626f0..648e464bfd 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js
@@ -48,7 +48,7 @@ const Oops = () => {
         <Row justifyContent="center">
           <Box paddingTop={4}>
             <Link to="/auth/login">
-              <Text>{formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}</Text>
+              {formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}
             </Link>
           </Box>
         </Row>
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js
index b93f38be7f..c5f9a8617d 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js
@@ -350,11 +350,7 @@ describe('ADMIN | PAGES | AUTH | Oops', () => {
                   <span
                     class="c19 c20 c21"
                   >
-                    <span
-                      class="c15"
-                    >
-                      Sign in
-                    </span>
+                    Sign in
                   </span>
                 </a>
               </div>
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js
index b96a305e58..75980d0a78 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js
@@ -161,9 +161,7 @@ const ForgotPassword = ({ onSubmit, schema }) => {
         <Row justifyContent="center">
           <Box paddingTop={4}>
             <Link to="/auth/login">
-              <Text small>
-                {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
-              </Text>
+              {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
             </Link>
           </Box>
         </Row>
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 e7c82f3ce3..b712098d85 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
@@ -283,13 +283,6 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
         color: #32324d;
       }
 
-      .c37 {
-        font-weight: 400;
-        font-size: 0.75rem;
-        line-height: 1.33;
-        color: #32324d;
-      }
-
       .c18 {
         font-weight: 500;
         font-size: 0.75rem;
@@ -797,11 +790,7 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
                   <span
                     class="c34 c35 c36"
                   >
-                    <span
-                      class="c37"
-                    >
-                      Ready to sign in?
-                    </span>
+                    Ready to sign in?
                   </span>
                 </a>
               </div>
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js
index 8d6bfe2948..51d4451725 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js
@@ -52,7 +52,7 @@ const ApplicationInfosPage = () => {
 
               <Grid paddingTop={1}>
                 <GridItem col={6} s={12}>
-                  <TableLabel>
+                  <TableLabel textColor="neutral600">
                     {formatMessage({
                       id: 'Settings.application.details',
                       defaultMessage: 'details',
@@ -61,7 +61,7 @@ const ApplicationInfosPage = () => {
                   <Text as="p">{appInfos.latestStrapiReleaseTag}</Text>
                 </GridItem>
                 <GridItem col={6} s={12}>
-                  <TableLabel>
+                  <TableLabel textColor="neutral600">
                     {formatMessage({
                       id: 'Settings.application.edition-title',
                       defaultMessage: 'current plan',
@@ -103,7 +103,7 @@ const ApplicationInfosPage = () => {
               </Grid>
 
               <Box paddingTop={1}>
-                <TableLabel>
+                <TableLabel textColor="neutral600">
                   {formatMessage({
                     id: 'Settings.application.node-version',
                     defaultMessage: 'node version',
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js
index c2ef57f850..75166ada88 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js
@@ -42,7 +42,7 @@ describe('Application page', () => {
         box-shadow: 0px 1px 4px rgba(33,33,52,0.1);
       }
 
-      .c26 {
+      .c27 {
         padding-top: 4px;
       }
 
@@ -73,6 +73,13 @@ describe('Application page', () => {
       }
 
       .c17 {
+        font-weight: 400;
+        font-size: 0.875rem;
+        line-height: 1.43;
+        color: #666687;
+      }
+
+      .c20 {
         font-weight: 400;
         font-size: 0.875rem;
         line-height: 1.43;
@@ -186,30 +193,30 @@ describe('Application page', () => {
         grid-column: span 6;
       }
 
-      .c21 {
+      .c22 {
         font-weight: 400;
         font-size: 0.875rem;
         line-height: 1.43;
         color: #4945ff;
       }
 
-      .c22 {
+      .c23 {
         font-weight: 600;
         line-height: 1.14;
       }
 
-      .c23 {
+      .c24 {
         font-weight: 600;
         font-size: 0.6875rem;
         line-height: 1.45;
         text-transform: uppercase;
       }
 
-      .c24 {
+      .c25 {
         padding-left: 8px;
       }
 
-      .c20 {
+      .c21 {
         display: -webkit-inline-box;
         display: -webkit-inline-flex;
         display: -ms-inline-flexbox;
@@ -225,15 +232,15 @@ describe('Application page', () => {
         outline: none;
       }
 
-      .c20 svg path {
+      .c21 svg path {
         fill: #4945ff;
       }
 
-      .c20 svg {
+      .c21 svg {
         font-size: 0.625rem;
       }
 
-      .c20:after {
+      .c21:after {
         -webkit-transition-property: all;
         transition-property: all;
         -webkit-transition-duration: 0.2s;
@@ -248,11 +255,11 @@ describe('Application page', () => {
         border: 2px solid transparent;
       }
 
-      .c20:focus-visible {
+      .c21:focus-visible {
         outline: none;
       }
 
-      .c20:focus-visible:after {
+      .c21:focus-visible:after {
         border-radius: 8px;
         content: '';
         position: absolute;
@@ -263,7 +270,7 @@ describe('Application page', () => {
         border: 2px solid #4945ff;
       }
 
-      .c25 {
+      .c26 {
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
@@ -351,7 +358,7 @@ describe('Application page', () => {
                           details
                         </span>
                         <p
-                          class="c17"
+                          class="c20"
                         >
                           v3.6.8
                         </p>
@@ -369,7 +376,7 @@ describe('Application page', () => {
                           current plan
                         </span>
                         <p
-                          class="c17"
+                          class="c20"
                         >
                           Enterprise Edition
                         </p>
@@ -386,19 +393,19 @@ describe('Application page', () => {
                         class=""
                       >
                         <a
-                          class="c20"
+                          class="c21"
                           href="https://github.com/strapi/strapi/releases/tag/v3.6.8"
                           rel="noreferrer noopener"
                           target="_blank"
                         >
                           <span
-                            class="c21 c22 c23"
+                            class="c22 c23 c24"
                           >
                             Upgrade your admin panel
                           </span>
                           <span
                             aria-hidden="true"
-                            class="c24 c25"
+                            class="c25 c26"
                           >
                             <svg
                               fill="none"
@@ -423,19 +430,19 @@ describe('Application page', () => {
                         class=""
                       >
                         <a
-                          class="c20"
+                          class="c21"
                           href="https://strapi.io/pricing-self-hosted"
                           rel="noreferrer noopener"
                           target="_blank"
                         >
                           <span
-                            class="c21 c22 c23"
+                            class="c22 c23 c24"
                           >
                             See all pricing
                           </span>
                           <span
                             aria-hidden="true"
-                            class="c24 c25"
+                            class="c25 c26"
                           >
                             <svg
                               fill="none"
@@ -455,7 +462,7 @@ describe('Application page', () => {
                     </div>
                   </div>
                   <div
-                    class="c26"
+                    class="c27"
                   >
                     <span
                       class="c17 c18 c19"
@@ -463,7 +470,7 @@ describe('Application page', () => {
                       node version
                     </span>
                     <p
-                      class="c17"
+                      class="c20"
                     />
                   </div>
                 </div>
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index c6afef9376..5500f2703b 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -299,7 +299,7 @@
   "app.components.ToggleCheckbox.on-label": "On",
   "app.components.UpgradePlanModal.button": "Learn more",
   "app.components.UpgradePlanModal.limit-reached": "You have reached the limit",
-  "app.components.UpgradePlanModal.text-ce": "COMMUNITY EDITION",
+  "app.components.UpgradePlanModal.text-ce": "Community Edition",
   "app.components.UpgradePlanModal.text-ee": "Enterprise Edition",
   "app.components.UpgradePlanModal.text-power": "Unlock the full power of Strapi by upgrading your plan to the Enterprise Edition",
   "app.components.UpgradePlanModal.text-strapi": "of Strapi by upgrading your plan to the",