diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/MenuDropdown.js b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/MenuDropdown.js
index e0001d8bdc..b344917e86 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/MenuDropdown.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/MenuDropdown.js
@@ -10,16 +10,12 @@ const MenuDropdown = styled(DropdownMenu)`
   box-shadow: 0px 2px 4px rgba(227, 233, 243, 0.5);
   transform: translate3d(-178px, 28px, 0px) !important;
 
-  ${({ isopen }) => {
-    if (isopen === 'true') {
-      return `
-        border-top-color: #aed4fb !important;
-        border-top-right-radius: 0;
-      `;
-    }
-
-    return '';
-  }}
+  ${({ isopen }) =>
+  isopen &&
+    `
+    border-top-color: #aed4fb !important;
+    border-top-right-radius: 0;
+  `}
 `;
 
 export default MenuDropdown;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/Toggle.js b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/Toggle.js
index 5d7e55b7ee..fcb5b5007f 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/Toggle.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/Toggle.js
@@ -18,70 +18,70 @@ const Toggle = styled(DropdownToggle)`
   }
 
   ${({ isopen }) => {
-    // Fix react warning
-    if (isopen === 'true') {
-      return `
-        background: #e6f0fb;
-        border: 1px solid #aed4fb !important;
-        border-radius: 2px;
-        border-bottom-right-radius: 0 !important;
-        border-bottom-left-radius: 0 !important;
-        border-top-right-radius: 2px !important;
-
-        &:before {
-          content: '\f013';
-          font-family: FontAwesome;
-          color: #007eff;
-        }
-
-        &:after {
-          content: '\f0d7';
-          display: inline-block;
-          margin-top: -1px;
-          margin-left: 10px;
-          font-family: FontAwesome;
-          color: #007eff;
-          transform: rotateX(180deg);
-          transition: transform 0.3s ease-out;
-        }
-
-        &:hover,
-        :active,
-        :focus {
-          background: #e6f0fb;
-          border: 1px solid #aed4fb;
-        }
-      `;
-    }
-
+  // Fix react warning
+  if (isopen === 'true') {
     return `
-      background: #ffffff !important;
-      border: 1px solid #e3e9f3;
-      border-radius: 2px !important;
-      font-size: 1.4rem;
+      background: #e6f0fb;
+      border: 1px solid #aed4fb !important;
+      border-radius: 2px;
+      border-bottom-right-radius: 0 !important;
+      border-bottom-left-radius: 0 !important;
+      border-top-right-radius: 2px !important;
 
       &:before {
         content: '\f013';
         font-family: FontAwesome;
-        color: #323740;
+        color: #007eff;
       }
+
       &:after {
         content: '\f0d7';
         display: inline-block;
         margin-top: -1px;
-        margin-left: 11px;
+        margin-left: 10px;
         font-family: FontAwesome;
-        color: #323740;
+        color: #007eff;
+        transform: rotateX(180deg);
         transition: transform 0.3s ease-out;
       }
+
       &:hover,
-      :focus,
-      :active {
-        background: #ffffff !important;
-        border: 1px solid #e3e9f3;
+      :active,
+      :focus {
+        background: #e6f0fb;
+        border: 1px solid #aed4fb;
       }
     `;
-  }}
+  }
+
+  return `
+    background: #ffffff !important;
+    border: 1px solid #e3e9f3;
+    border-radius: 2px !important;
+    font-size: 1.4rem;
+
+    &:before {
+      content: '\f013';
+      font-family: FontAwesome;
+      color: #323740;
+    }
+    &:after {
+      content: '\f0d7';
+      display: inline-block;
+      margin-top: -1px;
+      margin-left: 11px;
+      font-family: FontAwesome;
+      color: #323740;
+      transition: transform 0.3s ease-out;
+    }
+    &:hover,
+    :focus,
+    :active {
+      background: #ffffff !important;
+      border: 1px solid #e3e9f3;
+    }
+  `;
+}}
 `;
 
 export default Toggle;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js
index 52e522d756..2a7ae6f1ff 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js
@@ -9,20 +9,20 @@ const NameWrapper = styled.div`
   cursor: pointer;
 
   ${({ isOverEditBlock, isOverRemove, isSelected }) => {
-    if (isOverRemove) {
-      return `
-      color: #f64d0a;
-    `;
-    }
+  if (isOverRemove) {
+    return `
+    color: #f64d0a;
+  `;
+  }
 
-    if (isSelected || isOverEditBlock) {
-      return `
-      color: #007eff;
-    `;
-    }
+  if (isSelected || isOverEditBlock) {
+    return `
+    color: #007eff;
+  `;
+  }
 
-    return '';
-  }}
+  return '';
+}}
 `;
 
 export default NameWrapper;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js
index a5575eeeb6..e4e22b9e96 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js
@@ -3,16 +3,16 @@ import styled from 'styled-components';
 const Carret = styled.div`
   position: absolute;
   ${({ right }) => {
-    if (right) {
-      return `
-        right: -4px;
-      `;
-    }
-
+  if (right) {
     return `
-      left: -1px;
+      right: -4px;
     `;
-  }}
+  }
+
+  return `
+    left: -1px;
+  `;
+}}
   height: 100%;
   width: 2px;
   margin-right: 3px;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js
index 99cc45639a..aaf277d10e 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js
@@ -13,18 +13,15 @@ const Button = styled(PlusButton)`
     }
   }
 
-  ${({ hasError }) => {
-    if (hasError) {
-      return `
-        background-color: #FAA684;
-        :before, :after {
-          background-color: #F64D0A;
-        }
-      `;
+  ${({ hasError }) =>
+  hasError &&
+    `
+    background-color: #FAA684;
+    :before, :after {
+      background-color: #F64D0A;
     }
+  `}
 
-    return '';
-  }}
   &.isOpen {
     transform: rotate(-45deg);
   }
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js
index aaf4f842ba..2d5259674d 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js
@@ -1,4 +1,4 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
 const ComponentsPicker = styled.div`
   overflow: hidden;
@@ -12,10 +12,10 @@ const ComponentsPicker = styled.div`
   }
 
   ${({ isOpen }) =>
-    isOpen &&
-    css`
-      max-height: 260px;
-    `}
+  isOpen &&
+    `
+    max-height: 260px;
+  `}
 
   .componentPickerTitle {
     margin-bottom: 15px;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputCheckbox/components.js b/packages/strapi-plugin-content-manager/admin/src/components/InputCheckbox/components.js
index fe1169a3db..b1d631c3c4 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/InputCheckbox/components.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/InputCheckbox/components.js
@@ -1,4 +1,4 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
 const Div = styled.div`
   padding-left: 0;
@@ -41,26 +41,22 @@ const Label = styled.label`
     border-radius: 3px;
   }
 
-  ${({ value }) => {
-    if (value === true) {
-      return css`
-        font-weight: 500;
-        &:after {
-          content: '\f00c';
-          position: absolute;
-          top: 1px;
-          left: 17px;
-          font-size: 10px;
-          font-family: 'FontAwesome';
-          font-weight: 100;
-          color: #1c5de7;
-          transition: all 0.2s;
-        }
-      `;
+  ${({ value }) =>
+  value &&
+    `
+    font-weight: 500;
+    &:after {
+      content: '\f00c';
+      position: absolute;
+      top: 1px;
+      left: 17px;
+      font-size: 10px;
+      font-family: 'FontAwesome';
+      font-weight: 100;
+      color: #1c5de7;
+      transition: all 0.2s;
     }
-
-    return '';
-  }}
+  `}
 `;
 
 export { Div, Label };
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js
index aa89a031f0..835e66310e 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js
@@ -5,60 +5,60 @@ const NonRepeatableWrapper = styled.div`
   padding: 0 20px !important;
 
   ${({ isEmpty, isFromDynamicZone }) => {
-    if (isEmpty) {
-      return `
-        position: relative;
-        height: 108px;
-        margin-bottom: 21px !important;
-        background-color: #fafafb;
-        text-align: center;
-        cursor: pointer;
-        border-radius: 2px;
-
-        > button {
-          position: absolute;
-          top: 30px;
-          left: calc(50% - 18px);
-          height: 36px;
-          width: 36px;
-          line-height: 38px;
-          border-radius: 50%;
-          background-color: #f3f4f4;
-          cursor: pointer;
-        }
-        border: 1px solid transparent;
-
-        &:hover {
-          border: 1px solid #aed4fb;
-          background-color: #e6f0fb;
-          > button {
-            :before,
-            :after {
-              background-color: #007eff;
-            }
-            background-color: #aed4fb;
-          }
-
-          > p {
-            color: #007eff;
-          }
-        }
-      `;
-    }
-
-    if (isFromDynamicZone) {
-      return `
-        background-color: #fff;
-        padding: 0 10px !important;
-      `;
-    }
-
+  if (isEmpty) {
     return `
-      padding-top: 25px !important;
-      background-color: #f7f8f8;
-      margin-bottom: 18px !important;
+      position: relative;
+      height: 108px;
+      margin-bottom: 21px !important;
+      background-color: #fafafb;
+      text-align: center;
+      cursor: pointer;
+      border-radius: 2px;
+
+      > button {
+        position: absolute;
+        top: 30px;
+        left: calc(50% - 18px);
+        height: 36px;
+        width: 36px;
+        line-height: 38px;
+        border-radius: 50%;
+        background-color: #f3f4f4;
+        cursor: pointer;
+      }
+      border: 1px solid transparent;
+
+      &:hover {
+        border: 1px solid #aed4fb;
+        background-color: #e6f0fb;
+        > button {
+          :before,
+          :after {
+            background-color: #007eff;
+          }
+          background-color: #aed4fb;
+        }
+
+        > p {
+          color: #007eff;
+        }
+      }
     `;
-  }}
+  }
+
+  if (isFromDynamicZone) {
+    return `
+      background-color: #fff;
+      padding: 0 10px !important;
+    `;
+  }
+
+  return `
+    padding-top: 25px !important;
+    background-color: #f7f8f8;
+    margin-bottom: 18px !important;
+  `;
+}}
 `;
 
 export default NonRepeatableWrapper;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js b/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js
index a6f0972f72..9b4bc3995a 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js
@@ -1,4 +1,4 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
 const Wrapper = styled.div`
   display: flex;
@@ -7,16 +7,14 @@ const Wrapper = styled.div`
   height: 30px;
   width: 100%;
   padding: 0 5px;
-  ${({ isComponent }) => {
-    if (isComponent) {
-      return css`
-        height: 34px;
-        padding: 0;
-      `;
-    }
 
-    return '';
-  }}
+  ${({ isComponent }) =>
+  isComponent &&
+    `
+    height: 34px;
+    padding: 0;
+  `}
+
   border-radius: 2px;
   > div {
     width: 100%;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js
index 01ced822ac..b89144b000 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js
@@ -10,13 +10,11 @@ const EmptyComponent = styled.div`
   text-align: center;
   background-color: #fff;
 
-  ${({ hasMinError }) => {
-    if (hasMinError) {
-      return 'border-color: #FAA684';
-    }
-
-    return '';
-  }}
+  ${({ hasMinError }) =>
+  hasMinError &&
+    `
+    border-color: #FAA684
+  `}
 
   > p {
     color: #9ea7b8;