diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js
index e8bde872be..d957d4335f 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeRow/index.js
@@ -24,7 +24,7 @@ class AttributeRow extends React.Component { // eslint-disable-line react/prefer
     this.asset = {
       'boolean': IcoBoolean,
       'date': IcoDate,
-      'image': IcoImage,
+      'media': IcoImage,
       'json': IcoJson,
       'relation': IcoRelation,
       'string': IcoString,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
index b48307e5a5..b5ea150e56 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
@@ -220,20 +220,148 @@
       }
     },
     "date": {
-      "baseSettings": {},
-      "advancedSettings": {}
+      "baseSettings": {
+        "items": [
+          {
+            "name": "form.attribute.item.date.name",
+            "target": "name",
+            "type": "string",
+            "value": "",
+            "validations": {
+              "required": true
+            }
+          }
+        ]
+      },
+      "advancedSettings": {
+        "items": [
+          {
+            "title": "form.attribute.item.settings.name",
+            "name": "form.attribute.item.requiredField",
+            "target": "params.required",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.requiredField.description"
+          },
+          {
+            "name": "form.attribute.item.uniqueField",
+            "target": "params.unique",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.uniqueField.description"
+          }
+        ]
+      }
     },
     "boolean": {
-      "baseSettings": {},
-      "advancedSettings": {}
+      "baseSettings": {
+        "items": [
+          {
+            "name": "form.attribute.item.boolean.name",
+            "target": "name",
+            "type": "string",
+            "value": "",
+            "validations": {
+              "required": true
+            }
+          }
+        ]
+      },
+      "advancedSettings": {
+        "items": [
+          {
+            "title": "form.attribute.item.settings.name",
+            "name": "form.attribute.item.requiredField",
+            "target": "params.required",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.requiredField.description"
+          },
+          {
+            "name": "form.attribute.item.uniqueField",
+            "target": "params.unique",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.uniqueField.description"
+          }
+        ]
+      }
     },
     "json": {
-      "baseSettings": {},
-      "advancedSettings": {}
+      "baseSettings": {
+        "items": [
+          {
+            "name": "form.attribute.item.json.name",
+            "target": "name",
+            "type": "string",
+            "value": "",
+            "validations": {
+              "required": true
+            }
+          }
+        ]
+      },
+      "advancedSettings": {
+        "items": [
+          {
+            "title": "form.attribute.item.settings.name",
+            "name": "form.attribute.item.requiredField",
+            "target": "params.required",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.requiredField.description"
+          },
+          {
+            "name": "form.attribute.item.uniqueField",
+            "target": "params.unique",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.uniqueField.description"
+          }
+        ]
+      }
     },
     "media": {
-      "baseSettings": {},
-      "advancedSettings": {}
+      "baseSettings": {
+        "items": [
+          {
+            "name": "form.attribute.item.media.name",
+            "target": "name",
+            "type": "string",
+            "value": "",
+            "validations": {
+              "required": true
+            }
+          }
+        ]
+      },
+      "advancedSettings": {
+        "items": [
+          {
+            "title": "form.attribute.item.settings.name",
+            "name": "form.attribute.item.requiredField",
+            "target": "params.required",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.requiredField.description"
+          },
+          {
+            "name": "form.attribute.item.uniqueField",
+            "target": "params.unique",
+            "type": "checkbox",
+            "value": false,
+            "validations": {},
+            "inputDescription": "form.attribute.item.uniqueField.description"
+          }
+        ]
+      }
     }
   }
 }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js
index 56917aa4f6..de4e7cc1d0 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js
@@ -63,6 +63,7 @@ export class Form extends React.Component { // eslint-disable-line react/prefer-
     super(props);
     this.state = {
       showModal: false,
+      popUpTitleEdit: '',
     };
   }
 
@@ -297,6 +298,8 @@ export class Form extends React.Component { // eslint-disable-line react/prefer-
       }
 
       if (get(props.contentTypeData, 'name') && includes(props.hash, '#edit') && includes(props.hash, 'attribute')) {
+
+        this.setState({ popUpTitleEdit: get(props.contentTypeData, ['attributes', split(props.hash, '::')[3], 'name']) });
         this.props.setAttributeFormEdit(props.hash, props.contentTypeData);
       }
     } else {
@@ -348,12 +351,17 @@ export class Form extends React.Component { // eslint-disable-line react/prefer-
   )
 
   renderCustomPopUpHeader = (startTitle) => {
-    const italicText = replace(split(this.props.hash, ('::'))[1], 'attribute', '');
+    const italicText = !includes(this.props.hash, '#edit') ?
+      <FormattedMessage id={replace(split(this.props.hash, ('::'))[1], 'attribute', '')}>
+        {(message) => <span style={{ fontStyle: 'italic', textTransform: 'capitalize' }}>{message}</span>}
+      </FormattedMessage>
+       : <span style={{ fontStyle: 'italic', textTransform: 'capitalize' }}>{this.state.popUpTitleEdit}</span>;
     return (
       <div>
-        <FormattedMessage id={startTitle} />&nbsp;<FormattedMessage id={italicText}>
-          {(message) => <span style={{ fontStyle: 'italic', textTransform: 'capitalize' }}>{message}</span>}
-        </FormattedMessage>&nbsp;
+        <FormattedMessage id={startTitle} />
+        &nbsp;
+        {italicText}
+        &nbsp;
         <FormattedMessage id="popUpForm.field" />
       </div>
     )
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
index 7313c07e91..edd496045c 100755
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
@@ -14,6 +14,10 @@
   "button.attributes.add": "Add New Field",
 
   "form.attribute.item.textarea.name": "Name",
+  "form.attribute.item.date.name": "Name",
+  "form.attribute.item.media.name": "Name",
+  "form.attribute.item.json.name": "Name",
+  "form.attribute.item.boolean.name": "Name",
   "form.attribute.item.string.name": "Name",
   "form.attribute.item.settings.name": "Settings",
   "form.attribute.item.requiredField": "Required field",
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
index a2f4390475..bd67af2134 100755
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
@@ -13,6 +13,10 @@
   "button.attributes.add": "Ajouter un champs",
 
   "form.attribute.item.textarea.name": "Nom",
+  "form.attribute.item.date.name": "Nom",
+  "form.attribute.item.boolean.name": "Nom",
+  "form.attribute.item.json.name": "Nom",
+  "form.attribute.item.media.name": "Nom",
   "form.attribute.item.string.name": "Nom",
   "form.attribute.item.settings.name": "Paramètres",
   "form.attribute.item.requiredField": "Champ obligatoire",