diff --git a/public/images/default-avatar.jpg b/public/images/default-avatar.jpg
new file mode 100644
index 00000000..60ab5bf2
Binary files /dev/null and b/public/images/default-avatar.jpg differ
diff --git a/resources/assets/js/views/settings/CompanyInfo.vue b/resources/assets/js/views/settings/CompanyInfo.vue
index fae1d34c..8f1995f4 100644
--- a/resources/assets/js/views/settings/CompanyInfo.vue
+++ b/resources/assets/js/views/settings/CompanyInfo.vue
@@ -13,7 +13,7 @@
             <label class="input-label">{{ $tc('settings.company_info.company_logo') }}</label>
             <div id="pick-avatar" class="image-upload-box">
               <div class="overlay">
-                <font-awesome-icon class="white-icon" icon="cloud-upload-alt"/>
+                <font-awesome-icon class="white-icon" icon="camera"/>
               </div>
               <img v-if="previewLogo" :src="previewLogo" class="preview-logo">
               <div v-else class="upload-content">
diff --git a/resources/assets/js/views/settings/UserProfile.vue b/resources/assets/js/views/settings/UserProfile.vue
index a9bedba0..67e1fa08 100644
--- a/resources/assets/js/views/settings/UserProfile.vue
+++ b/resources/assets/js/views/settings/UserProfile.vue
@@ -16,7 +16,7 @@
                 <font-awesome-icon class="white-icon" icon="camera"/>
               </div>
               <img v-if="previewAvatar" :src="previewAvatar" class="preview-logo">
-              <div v-else class="upload-content">
+              <div v-if="!previewAvatar" class="upload-content">
                 <font-awesome-icon class="upload-icon" icon="cloud-upload-alt"/>
                 <p class="upload-text"> {{ $tc('general.choose_file') }} </p>
               </div>
@@ -183,7 +183,11 @@ export default {
       let response = await this.loadData()
       this.formData.name = response.data.name
       this.formData.email = response.data.email
-      this.previewAvatar = response.data.avatar
+      if (response.data.avatar) {
+        this.previewAvatar = response.data.avatar
+      } else {
+        this.previewAvatar = '/images/default-avatar.jpg'
+      }
     },
     async updateUserData () {
       this.$v.formData.$touch()
diff --git a/resources/assets/js/views/wizard/CompanyInfo.vue b/resources/assets/js/views/wizard/CompanyInfo.vue
index bd8c85a3..aa195b7c 100644
--- a/resources/assets/js/views/wizard/CompanyInfo.vue
+++ b/resources/assets/js/views/wizard/CompanyInfo.vue
@@ -8,7 +8,7 @@
           <label class="input-label">{{ $tc('settings.company_info.company_logo') }}</label>
           <div id="pick-avatar" class="image-upload-box">
             <div class="overlay">
-              <font-awesome-icon class="white-icon" icon="cloud-upload-alt"/>
+              <font-awesome-icon class="white-icon" icon="camera"/>
             </div>
             <img v-if="previewLogo" :src="previewLogo" class="preview-logo">
             <div v-else class="upload-content">
diff --git a/resources/assets/js/views/wizard/UserProfile.vue b/resources/assets/js/views/wizard/UserProfile.vue
index 9eca9c31..845136cc 100644
--- a/resources/assets/js/views/wizard/UserProfile.vue
+++ b/resources/assets/js/views/wizard/UserProfile.vue
@@ -129,7 +129,7 @@ export default {
         confirm_password: null
       },
       loading: false,
-      previewAvatar: null,
+      previewAvatar: '/images/default-avatar.jpg',
       fileObject: null
     }
   },
diff --git a/resources/assets/sass/components/avatar-cropper.scss b/resources/assets/sass/components/avatar-cropper.scss
index 72888629..eebf646c 100644
--- a/resources/assets/sass/components/avatar-cropper.scss
+++ b/resources/assets/sass/components/avatar-cropper.scss
@@ -11,8 +11,10 @@
     cursor: pointer;
 
     .preview-logo {
-        max-height: 50%;
+        max-height: 80%;
         position: absolute;
+        opacity: 1;
+        animation: fadeIn 2s ease;
     }
 
     .upload-content {
@@ -69,7 +71,17 @@
     height: 130px;
     width: 130px;
     .preview-logo {
-        max-height: 80% !important;
+        max-width: 80% !important;
+    }
+
+    @keyframes fadeIn{
+      0%{
+        opacity: 0;
+      }
+      100%{
+        opacity: 1;
+      }
     }
 }
 
+