diff --git a/packages/strapi-admin/admin/src/components/EventInput/tests/__snapshots__/index.test.js.snap b/packages/strapi-admin/admin/src/components/EventInput/tests/__snapshots__/index.test.js.snap
index f4fc5c91fb..3cd3e5f748 100644
--- a/packages/strapi-admin/admin/src/components/EventInput/tests/__snapshots__/index.test.js.snap
+++ b/packages/strapi-admin/admin/src/components/EventInput/tests/__snapshots__/index.test.js.snap
@@ -52,7 +52,7 @@ exports[`<EventInput /> should match the snapshot 1`] = `
 
 .c0 tbody td {
   height: 54px;
-  padding-bottom: 3px;
+  padding-top: 3px;
 }
 
 .c0 tbody td input[type='checkbox']:disabled:before {
@@ -69,7 +69,6 @@ exports[`<EventInput /> should match the snapshot 1`] = `
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
-  margin-top: -1px;
   font-weight: 500;
   cursor: pointer;
 }
@@ -237,89 +236,6 @@ exports[`<EventInput /> should match the snapshot 1`] = `
   color: #333740;
 }
 
-<<<<<<< HEAD
-=======
-.c0 {
-  padding-top: 3px;
-  padding-bottom: 8px;
-}
-
-.c0 table {
-  width: 100%;
-  border-radius: 2px;
-  overflow: hidden;
-}
-
-.c0 tr:before {
-  content: '-';
-  position: absolute;
-  left: 20px;
-  display: inline-block;
-  width: calc(100% - 40px);
-  height: 1px;
-  margin-top: -1px;
-  line-height: 1.1em;
-  color: transparent;
-  background-color: #f6f6f6;
-}
-
-.c0 tr:first-of-type:before {
-  left: 0;
-  height: 2px;
-  width: 100%;
-  background-color: #fafafb;
-  z-index: 1;
-}
-
-.c0 thead {
-  background-color: #fafafb;
-}
-
-.c0 thead td {
-  height: 41px;
-  text-align: center;
-  font-size: 13px;
-  font-weight: 500;
-}
-
-.c0 tbody {
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
-  box-shadow: inset 0px 0px 0px 1px #f6f6f6;
-}
-
-.c0 tbody td {
-  height: 54px;
-  padding-top: 3px;
-}
-
-.c0 tbody td input[type='checkbox']:disabled:before {
-  background-color: #e8e5e5;
-}
-
-.c0 tbody td:first-of-type {
-  width: 200px;
-  padding-left: 30px;
-  text-transform: capitalize;
-}
-
-.c0 tbody td:first-of-type label {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  font-weight: 500;
-  cursor: pointer;
-}
-
-.c0 tbody td:not(:first-of-type) > div {
-  display: block;
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: 0 auto;
-}
-
->>>>>>> a5718f9eb7ba4476e23ebc9b9d4682aeb6360768
 <div
   className="c0"
 >
diff --git a/packages/strapi-admin/admin/src/components/Notification/Li.js b/packages/strapi-admin/admin/src/components/Notification/Li.js
index b92bee7934..1353a272fb 100644
--- a/packages/strapi-admin/admin/src/components/Notification/Li.js
+++ b/packages/strapi-admin/admin/src/components/Notification/Li.js
@@ -42,16 +42,16 @@ const GlobalNotification = createGlobalStyle`
   }
 
   .notificationClose {
-    cursor: pointer;
-    opacity: 0.6;
     position: relative;
     display: flex;
     width: 20px;
+    margin-right: 15px;
+    cursor: pointer;
+    opacity: 0.6;
     font-size: 1.4rem;
     color: #BBC2BF;
     transition: opacity 0.1s ease;
     -webkit-font-smoothing: antialiased;
-    margin-right: 15px
 
     &:hover {
       opacity: 1;
@@ -68,9 +68,8 @@ const GlobalNotification = createGlobalStyle`
     background: linear-gradient(
       100deg, 
       #FFFFFF 50%,
-      rgba(39, 183, 15, .05)
-    ),
-    ${props => props.theme.main.colors.white};
+      rgba(39, 183, 15, .05)),
+      ${props => props.theme.main.colors.white};
     .notificationIcon {
       div {
         border-color: ${props => props.theme.main.colors.green};
@@ -85,8 +84,8 @@ const GlobalNotification = createGlobalStyle`
     background: linear-gradient(
       100deg,
       #FFFFFF 50%,
-      rgba(250, 156, 0, .05)
-    ), ${props => props.theme.main.colors.white};
+      rgba(250, 156, 0, .05)),
+      ${props => props.theme.main.colors.white};
     .notificationIcon {
       div {
         border-color: ${props => props.theme.main.colors.orange};
@@ -98,11 +97,8 @@ const GlobalNotification = createGlobalStyle`
   }
 
   .notificationError {
-    background: linear-gradient(
-      100deg,
-      #FFFFFF 50%,
-      rgba(255, 93, 0, .05)
-    ), $white;
+    background: linear-gradient(100deg , #FFFFFF 50%, rgba(255, 93, 0, .05)), $white;
+
     .notificationIcon {
       div {
         border-color: ${props => props.theme.main.colors.red};
@@ -117,8 +113,8 @@ const GlobalNotification = createGlobalStyle`
     background: linear-gradient(
       100deg,
       #FFFFFF 50%,
-      rgba(28, 93, 231, .05)
-    ), ${props => props.theme.main.colors.white};
+      rgba(28, 93, 231, .05)),
+      ${props => props.theme.main.colors.white};
     .notificationIcon {
       div {
         border-color: ${props => props.theme.main.colors.blue};
diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/EditView/tests/__snapshots__/index.test.js.snap b/packages/strapi-admin/admin/src/containers/Webhooks/EditView/tests/__snapshots__/index.test.js.snap
index dabb57d20d..f12bc2c7d8 100644
--- a/packages/strapi-admin/admin/src/containers/Webhooks/EditView/tests/__snapshots__/index.test.js.snap
+++ b/packages/strapi-admin/admin/src/containers/Webhooks/EditView/tests/__snapshots__/index.test.js.snap
@@ -2,7 +2,163 @@
 
 exports[`Admin | containers | EditView should match the snapshot 1`] = `
 <DocumentFragment>
-  .c1 {
+  .c20 {
+  cursor: pointer;
+  margin: 0;
+  position: relative;
+  width: 14px;
+  font-weight: 100;
+}
+
+.c20:focus,
+.c20:active {
+  outline: 0;
+}
+
+.c20:before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 50%;
+  margin-top: calc(-14px / 2);
+  width: 14px;
+  height: 14px;
+  border: 1px solid rgba(16,22,34,0.15);
+  background-color: #fdfdfd;
+  border-radius: 3px;
+  box-sizing: border-box;
+}
+
+.c20:after {
+  display: none;
+  content: '\\f00c';
+  font-family: 'FontAwesome';
+  position: absolute;
+  left: 0px;
+  top: 55%;
+  margin-top: calc(-14px / 2);
+  width: 14px;
+  height: 14px;
+  text-align: center;
+  font-size: 9px;
+  font-weight: 400;
+  color: #1C5DE7;
+  line-height: 14px;
+}
+
+.c20:checked:after {
+  display: block;
+}
+
+.c20:disabled {
+  background-color: #FAFAFB;
+  cursor: initial;
+}
+
+.c20 + label {
+  display: inline-block;
+  font-weight: 400;
+  font-size: 1.3rem;
+}
+
+.c19 {
+  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;
+  height: 18px;
+  line-height: 18px;
+}
+
+.c19 input label {
+  cursor: pointer;
+  margin-bottom: 0 !important;
+}
+
+.c19 input + label {
+  margin-left: 10px;
+  margin-bottom: 0;
+}
+
+.c16 {
+  width: 100%;
+  height: 3.4rem;
+  padding: 0 1rem;
+  font-weight: 400;
+  font-size: 1.3rem;
+  cursor: text;
+  outline: 0;
+  border: 1px solid #E3E9F3;
+  border-radius: 2px;
+  color: #333740;
+  background-color: transparent;
+}
+
+.c16::-webkit-input-placeholder {
+  color: #919BAE;
+}
+
+.c16:focus {
+  border-color: #78caff;
+}
+
+.c16:disabled {
+  background-color: #FAFAFB;
+}
+
+.c15 {
+  position: relative;
+  background-color: #ffffff;
+}
+
+.c15 button[type='button'] {
+  width: 3.4rem;
+  height: 3.4rem;
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  cursor: pointer;
+  outline: 0;
+  border: 0;
+  background: transparent;
+}
+
+.c15 button[type='button']:hover span::before {
+  color: #000000;
+}
+
+.c15 button[type='button'].shown span::before {
+  color: #000000;
+}
+
+.c15 button[type='button'].shown + input[type='text'] {
+  padding-right: calc(3.4rem + 1rem);
+}
+
+.c15 span {
+  z-index: 0;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
+.c15 input {
+  position: relative;
+  z-index: 1;
+}
+
+.c21 {
+  width: 100%;
+  font-weight: 500;
+  font-size: 1.3rem;
+  color: #333740;
+}
+
+.c1 {
   position: fixed;
   top: 0;
   height: 6rem;
@@ -396,162 +552,6 @@ exports[`Admin | containers | EditView should match the snapshot 1`] = `
   margin-bottom: -8px;
 }
 
-.c20 {
-  cursor: pointer;
-  margin: 0;
-  position: relative;
-  width: 14px;
-  font-weight: 100;
-}
-
-.c20:focus,
-.c20:active {
-  outline: 0;
-}
-
-.c20:before {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 50%;
-  margin-top: calc(-14px / 2);
-  width: 14px;
-  height: 14px;
-  border: 1px solid rgba(16,22,34,0.15);
-  background-color: #fdfdfd;
-  border-radius: 3px;
-  box-sizing: border-box;
-}
-
-.c20:after {
-  display: none;
-  content: '\\f00c';
-  font-family: 'FontAwesome';
-  position: absolute;
-  left: 0px;
-  top: 55%;
-  margin-top: calc(-14px / 2);
-  width: 14px;
-  height: 14px;
-  text-align: center;
-  font-size: 9px;
-  font-weight: 400;
-  color: #1C5DE7;
-  line-height: 14px;
-}
-
-.c20:checked:after {
-  display: block;
-}
-
-.c20:disabled {
-  background-color: #FAFAFB;
-  cursor: initial;
-}
-
-.c20 + label {
-  display: inline-block;
-  font-weight: 400;
-  font-size: 1.3rem;
-}
-
-.c19 {
-  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;
-  height: 18px;
-  line-height: 18px;
-}
-
-.c19 input label {
-  cursor: pointer;
-  margin-bottom: 0 !important;
-}
-
-.c19 input + label {
-  margin-left: 10px;
-  margin-bottom: 0;
-}
-
-.c16 {
-  width: 100%;
-  height: 3.4rem;
-  padding: 0 1rem;
-  font-weight: 400;
-  font-size: 1.3rem;
-  cursor: text;
-  outline: 0;
-  border: 1px solid #E3E9F3;
-  border-radius: 2px;
-  color: #333740;
-  background-color: transparent;
-}
-
-.c16::-webkit-input-placeholder {
-  color: #919BAE;
-}
-
-.c16:focus {
-  border-color: #78caff;
-}
-
-.c16:disabled {
-  background-color: #FAFAFB;
-}
-
-.c15 {
-  position: relative;
-  background-color: #ffffff;
-}
-
-.c15 button[type='button'] {
-  width: 3.4rem;
-  height: 3.4rem;
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 2;
-  cursor: pointer;
-  outline: 0;
-  border: 0;
-  background: transparent;
-}
-
-.c15 button[type='button']:hover span::before {
-  color: #000000;
-}
-
-.c15 button[type='button'].shown span::before {
-  color: #000000;
-}
-
-.c15 button[type='button'].shown + input[type='text'] {
-  padding-right: calc(3.4rem + 1rem);
-}
-
-.c15 span {
-  z-index: 0;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-}
-
-.c15 input {
-  position: relative;
-  z-index: 1;
-}
-
-.c21 {
-  width: 100%;
-  font-weight: 500;
-  font-size: 1.3rem;
-  color: #333740;
-}
-
 .c14 {
   margin-top: 12px;
   padding: 23px 24px 26px 24px;
diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/ListView/tests/__snapshots__/index.test.js.snap b/packages/strapi-admin/admin/src/containers/Webhooks/ListView/tests/__snapshots__/index.test.js.snap
index c4181f5b6b..03dc7ae198 100644
--- a/packages/strapi-admin/admin/src/containers/Webhooks/ListView/tests/__snapshots__/index.test.js.snap
+++ b/packages/strapi-admin/admin/src/containers/Webhooks/ListView/tests/__snapshots__/index.test.js.snap
@@ -2,7 +2,48 @@
 
 exports[`Admin | containers | ListView should match the snapshot 1`] = `
 <DocumentFragment>
-  .c6 button {
+  .c7 {
+  height: 30px;
+  padding: 0 15px;
+  font-weight: 500;
+  font-size: 1.3rem;
+  line-height: normal;
+  border-radius: 2px;
+  cursor: pointer;
+  outline: 0;
+  background-color: #ffffff;
+  background-color: #007EFF;
+  border: 1px solid #007EFF;
+  color: #ffffff;
+}
+
+.c7:hover {
+  -webkit-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
+  -moz-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
+  box-shadow: inset 0 0 30px [object Object];
+}
+
+.c7:active {
+  -webkit-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
+  -moz-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
+  box-shadow: inset 0 0 30px [object Object];
+}
+
+.c7:focus {
+  outline: 0;
+}
+
+.c7 > svg {
+  margin-right: 10px;
+  vertical-align: initial;
+}
+
+.c8 {
+  margin-right: 10px;
+  font-size: 0.94em;
+}
+
+.c6 button {
   width: 100%;
   height: 54px;
   border: 0;
@@ -30,7 +71,7 @@ exports[`Admin | containers | ListView should match the snapshot 1`] = `
 }
 
 .c9 {
-  width: 37.5rem !important;
+  width: 41.6rem !important;
   -webkit-font-smoothing: antialiased !important;
 }
 
@@ -183,47 +224,6 @@ exports[`Admin | containers | ListView should match the snapshot 1`] = `
   outline: 0;
 }
 
-.c7 {
-  height: 30px;
-  padding: 0 15px;
-  font-weight: 500;
-  font-size: 1.3rem;
-  line-height: normal;
-  border-radius: 2px;
-  cursor: pointer;
-  outline: 0;
-  background-color: #ffffff;
-  background-color: #007EFF;
-  border: 1px solid #007EFF;
-  color: #ffffff;
-}
-
-.c7:hover {
-  -webkit-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
-  -moz-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
-  box-shadow: inset 0 0 30px [object Object];
-}
-
-.c7:active {
-  -webkit-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
-  -moz-box-shadow: inset 0 0 30px rgba(0,0,0,0.1);
-  box-shadow: inset 0 0 30px [object Object];
-}
-
-.c7:focus {
-  outline: 0;
-}
-
-.c7 > svg {
-  margin-right: 10px;
-  vertical-align: initial;
-}
-
-.c8 {
-  margin-right: 10px;
-  font-size: 0.94em;
-}
-
 .c5 {
   padding: 54px 30px 30px;
   text-align: center;
diff --git a/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/tests/__snapshots__/index.test.js.snap b/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/tests/__snapshots__/index.test.js.snap
index 7f27542f01..b3939414f0 100644
--- a/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/tests/__snapshots__/index.test.js.snap
+++ b/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/tests/__snapshots__/index.test.js.snap
@@ -207,9 +207,7 @@ exports[`<PopUpWarning /> should render properly should match snapshot if onlyCo
               <h5
                 class="modal-title"
               >
-                <span>
-                  Please confirm
-                </span>
+                Please confirm
               </h5>
               <button
                 aria-label="Close"
@@ -232,9 +230,7 @@ exports[`<PopUpWarning /> should render properly should match snapshot if onlyCo
                   src="IMAGE_MOCK"
                 />
                 <p>
-                  <span>
-                    Are you sure you want to delete this?
-                  </span>
+                  Are you sure you want to delete this?
                 </p>
               </div>
             </div>
@@ -246,18 +242,14 @@ exports[`<PopUpWarning /> should render properly should match snapshot if onlyCo
                 color="cancel"
                 type="button"
               >
-                <span>
-                  Cancel
-                </span>
+                Cancel
               </button>
               <button
                 class="c7"
                 color="delete"
                 type="button"
               >
-                <span>
-                  Confirm
-                </span>
+                Confirm
               </button>
             </div>
           </div>
@@ -442,9 +434,7 @@ exports[`<PopUpWarning /> should render properly should match snapshot if onlyCo
               <h5
                 class="modal-title"
               >
-                <span>
-                  Please confirm
-                </span>
+                Please confirm
               </h5>
               <button
                 aria-label="Close"
@@ -467,9 +457,7 @@ exports[`<PopUpWarning /> should render properly should match snapshot if onlyCo
                   src="IMAGE_MOCK"
                 />
                 <p>
-                  <span>
-                    Are you sure you want to delete this?
-                  </span>
+                  Are you sure you want to delete this?
                 </p>
               </div>
             </div>
@@ -482,9 +470,7 @@ exports[`<PopUpWarning /> should render properly should match snapshot if onlyCo
                 style="width: 100%;"
                 type="button"
               >
-                <span>
-                  Confirm
-                </span>
+                Confirm
               </button>
             </div>
           </div>
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js
index 3c2b756edb..52afd9f5f3 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js
@@ -21,23 +21,23 @@ const Button = styled.button`
   }
 
   ${({ active, disabled }) => {
-    if (active) {
-      return css`
+  if (active) {
+    return css`
         border: 0;
         background: rgba(16, 22, 34, 0);
         box-shadow: inset 0 -1px 0 0 rgba(16, 22, 34, 0.04), inset 0 1px 0 0 rgba(16, 22, 34, 0.04);
       `;
-    }
+  }
 
-    if (disabled) {
-      return css`
+  if (disabled) {
+    return css`
         opacity: 0.7;
         cursor: not-allowed;
       `;
-    }
+  }
 
-    return '';
-  }}
+  return '';
+}}
 
   > svg {
     margin: auto;