diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/Button/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/Button/styles.scss
index 332d88d285..6b354dfd58 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/Button/styles.scss
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/Button/styles.scss
@@ -117,7 +117,8 @@
 }
 
 .saving {
-  margin-top: -2rem;
+  margin-top: -2.35rem;
+  padding-left: 4px;
   line-height: 3.8rem;
   font-size: 4rem;
 }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpForm/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpForm/styles.scss
index bb7b7b7216..00f4df6de8 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpForm/styles.scss
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpForm/styles.scss
@@ -88,6 +88,7 @@
   position: relative;
   > button {
     z-index: 999;
+    
     margin-right: -1.5rem;
     color: #C3C5C8;
     opacity: 1;
@@ -98,6 +99,17 @@
       opacity: 1;
       outline: 0;
     }
+    > span {
+      display: none;
+    }
+    &:before {
+      -webkit-font-smoothing: antialiased;
+      content: '\F00d';
+      font-family: 'FontAwesome';
+      font-weight: 400;
+      font-size: 1.2rem;
+      margin-right: 10px;
+    }
   }
 }
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/styles.scss
index 6685a4c868..3790c214e0 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/styles.scss
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/styles.scss
@@ -108,6 +108,17 @@
       opacity: 1;
       outline: 0;
     }
+    > span {
+      display: none;
+    }
+    &:before {
+      -webkit-font-smoothing: antialiased;
+      content: '\F00d';
+      font-family: 'FontAwesome';
+      font-weight: 400;
+      font-size: 1.2rem;
+      margin-right: 10px;
+    }
   }
 }
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpWarning/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpWarning/styles.scss
index 73fabbd68b..4b76db73d4 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpWarning/styles.scss
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpWarning/styles.scss
@@ -14,7 +14,7 @@
 
   }
   > button {
-    margin-top: -1.6rem;
+    margin-top: -2rem;
     margin-right: 0!important;
     z-index: 999;
     color: #C3C5C8;
@@ -26,6 +26,17 @@
       opacity: 1;
       outline: 0;
     }
+    > span {
+      display: none;
+    }
+    &:before {
+      -webkit-font-smoothing: antialiased;
+      content: '\F00d';
+      font-family: 'FontAwesome';
+      font-weight: 400;
+      font-size: 1.2rem;
+      margin-right: 10px;
+    }
   }
 }
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
index c841638f27..1f3da020bd 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
@@ -249,7 +249,7 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
   render() {
     // Url to redirects the user if he modifies the temporary content type name
     const redirectRoute = replace(this.props.match.path, '/:modelName', '');
-    const addButtons  = get(storeData.getContentType(), 'name') === this.props.match.params.modelName && size(get(storeData.getContentType(), 'attributes')) > 0 || this.props.modelPage.showButtons;
+    const addButtons  = get(storeData.getContentType(), 'name') === this.props.match.params.modelName && size(get(storeData.getContentType(), 'attributes')) > 0 || !this.props.modelPage.showButtons;
 
     const contentHeaderDescription = this.props.modelPage.model.description || 'content-type-builder.modelPage.contentHeader.emptyDescription.description';
     const content = size(this.props.modelPage.model.attributes) === 0 ?
@@ -282,7 +282,7 @@ export class ModelPage extends React.Component { // eslint-disable-line react/pr
                   editPath={`${redirectRoute}/${this.props.match.params.modelName}#edit${this.props.match.params.modelName}::contentType::baseSettings`}
                   addButtons={addButtons}
                   handleSubmit={this.props.submit}
-                  isLoading={this.props.modelPage.showButtonLoader}
+                  isLoading={!this.props.modelPage.showButtonLoader}
                   buttonsContent={this.contentHeaderButtons}
 
                 />