diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js
index 07b8547e5b..b884e54b57 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js
@@ -55,7 +55,7 @@ function List({
   };
 
   const addButtonProps = {
-    icon: !isSub ? <Plus fill="#007eff" /> : false,
+    icon: !isSub ? <Plus fill="#007eff" width="11px" height="11px" /> : false,
     color: 'primary',
     label: formatMessage({
       id: !isSub
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/WrapperSelect/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/WrapperSelect/index.js
index b8115fd38c..47a33d048a 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/WrapperSelect/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/WrapperSelect/index.js
@@ -20,7 +20,7 @@ const WrapperSelect = ({ error, label, name, type, ...rest }) => {
         : error
         ? '1px solid red !important'
         : '1px solid #E3E9F3 !important',
-      'border-radius': '2px !important',
+      borderRadius: '2px !important',
     }),
     menu: base => {
       return {
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js
index b01f454b2e..47ac3bf82d 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js
@@ -433,8 +433,6 @@ const DataManagerProvider = ({ allIcons, children }) => {
     });
   };
 
-  console.log({ modifiedData });
-
   return (
     <DataManagerContext.Provider
       value={{
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/CustomButton.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/CustomButton.js
new file mode 100644
index 0000000000..ca50524b03
--- /dev/null
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/CustomButton.js
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+import { Button } from '@buffetjs/core';
+
+const CustomButton = styled(Button)`
+  line-height: 30px;
+  svg {
+    height: 11px;
+    width: 11px;
+    vertical-align: middle;
+  }
+`;
+
+export default CustomButton;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
index 54f49971c7..2db9e47c3f 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
@@ -28,6 +28,7 @@ import RelationForm from '../../components/RelationForm';
 import HeaderNavLink from '../../components/HeaderNavLink';
 import WrapperSelect from '../../components/WrapperSelect';
 import getTrad from '../../utils/getTrad';
+import makeSearch from '../../utils/makeSearch';
 import getAttributes from './utils/attributes';
 import forms from './utils/forms';
 import { createComponentUid, createUid } from './utils/createUid';
@@ -36,7 +37,7 @@ import getNextSearch from './utils/getNextSearch';
 import { NAVLINKS, INITIAL_STATE_DATA } from './utils/staticData';
 import init from './init';
 import reducer, { initialState } from './reducer';
-import makeSearch from '../../utils/makeSearch';
+import CustomButton from './CustomButton';
 
 const FormModal = () => {
   const [state, setState] = useState(INITIAL_STATE_DATA);
@@ -1313,7 +1314,7 @@ const FormModal = () => {
                     {formatMessage({ id: getTrad('button.delete.title') })}
                   </Button>
                 )}
-                <Button
+                <CustomButton
                   type={isCreating ? 'submit' : 'button'}
                   color={
                     (isCreatingContentType ||
@@ -1329,11 +1330,12 @@ const FormModal = () => {
                       !isCreatingComponentFromAView &&
                       state.step !== '1') ||
                     (state.modalType === 'addComponentToDynamicZone' &&
-                      isCreatingComponentFromAView)
+                      isCreatingComponentFromAView) ||
+                    (isCreatingComponentFromAView && state.step === '2')
                   }
                 >
                   {getButtonSubmitMessage()}
-                </Button>
+                </CustomButton>
               </div>
             </section>
           </ModalFooter>
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js
index fb8c634341..a202a0a087 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js
@@ -445,7 +445,7 @@ const forms = {
               ? [[{ type: 'spacer' }]].concat(
                   componentForm.base('componentToCreate.')
                 )
-              : [];
+              : [[{ type: 'spacer' }]];
 
           return {
             items: [[fields.createComponent], ...itemsToConcat],
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js
index 7428fc20c3..6022f3563a 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js
@@ -11,6 +11,14 @@ const Wrapper = styled(ViewContainer)`
   .button-submit {
     min-width: 140px;
   }
+  .add-button {
+    line-height: 30px;
+    svg {
+      height: 11px;
+      width: 11px;
+      vertical-align: middle;
+    }
+  }
 `;
 
 export default Wrapper;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js
index 322ec33722..2dae81382b 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js
@@ -250,6 +250,7 @@ const ListPage = () => {
 
   const addButtonProps = {
     icon: true,
+    className: 'add-button',
     color: 'primary',
     label: formatMessage({ id: `${pluginId}.button.attributes.add.another` }),
     onClick: () => {
@@ -268,7 +269,7 @@ const ListPage = () => {
     color: 'secondary',
     label: formatMessage({ id: `${pluginId}.form.button.configure-view` }),
     onClick: goToCMSettingsPage,
-    style: { height: '30px' },
+    style: { height: '30px', marginTop: '1px' },
     className: 'button-secondary',
   };
 
@@ -320,7 +321,11 @@ const ListPage = () => {
               <Header {...headerProps} />
 
               <ListWrapper>
-                <ListHeader actions={listActions} title={listTitle} />
+                <ListHeader
+                  actions={listActions}
+                  title={listTitle}
+                  // style={{ top: 1 }}
+                />
                 <List
                   items={convertAttrObjToArray(attributes)}
                   customRowComponent={props => <CustomRow {...props} />}