diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index cf90a23b4..fd6ad18bc 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -2,6 +2,21 @@
   <ds-form ref="contributionForm" v-model="form" :schema="formSchema" @submit="submit">
     <template slot-scope="{ errors }">
       <ds-card>
+        <vue-dropzone
+          :options="dropzoneOptions"
+          ref="el"
+          id="postdropzone"
+          :use-custom-slot="true"
+          @vdropzone-error="verror"
+        >
+          <div class="dz-message" @mouseover="hover = true" @mouseleave="hover = false">
+            <div class="hc-attachments-upload-area">
+              <div class="hc-drag-marker">
+                <ds-icon v-if="hover" name="image" size="xxx-large" />
+              </div>
+            </div>
+          </div>
+        </vue-dropzone>
         <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
         <no-ssr>
           <hc-editor :users="users" :value="form.content" @input="updateEditorContent" />
@@ -20,6 +35,7 @@
             {{ $t('actions.save') }}
           </ds-button>
         </div>
+        <ds-space margin-bottom="large" />
       </ds-card>
     </template>
   </ds-form>
@@ -27,11 +43,13 @@
 
 <script>
 import gql from 'graphql-tag'
+import vueDropzone from 'nuxt-dropzone'
 import HcEditor from '~/components/Editor'
 
 export default {
   components: {
     HcEditor,
+    vueDropzone,
   },
   props: {
     contribution: { type: Object, default: () => {} },
@@ -41,6 +59,7 @@ export default {
       form: {
         title: '',
         content: '',
+        teaserImage: '',
       },
       formSchema: {
         title: { required: true, min: 3, max: 64 },
@@ -51,6 +70,12 @@ export default {
       disabled: false,
       slug: null,
       users: [],
+      dropzoneOptions: {
+        url: this.vddrop,
+        maxFilesize: 5.0,
+        previewTemplate: this.template(),
+      },
+      hover: false,
     }
   },
   watch: {
@@ -103,6 +128,18 @@ export default {
       // this.form.content = value
       this.$refs.contributionForm.update('content', value)
     },
+    template() {
+      return `<div class="dz-preview dz-file-preview">
+                <div class="dz-image">
+                  <div data-dz-thumbnail-bg></div>
+                </div>
+              </div>
+      `
+    },
+    vddrop(file) {
+      this.form.teaserImage = file[0]
+    },
+    verror(file, message) {},
   },
   apollo: {
     User: {
@@ -135,4 +172,61 @@ export default {
     padding-right: 0;
   }
 }
+
+#postdropzone {
+  height: 160px;
+  background-color: $background-color-softest;
+}
+
+.hc-attachments-upload-area {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.hc-drag-marker {
+  position: relative;
+  width: 122px;
+  height: 122px;
+  border-radius: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: hsl(0, 0%, 25%);
+  transition: all 0.2s ease-out;
+  font-size: 60px;
+  margin: 20px auto 5px;
+
+  background-color: rgba(255, 255, 255, 0.3);
+  opacity: 0.65;
+
+  &:before {
+    position: absolute;
+    content: '';
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    border-radius: 100%;
+    border: 20px solid rgba(255, 255, 255, 0.4);
+    visibility: hidden;
+  }
+
+  &:after {
+    position: absolute;
+    content: '';
+    top: 10px;
+    left: 10px;
+    bottom: 10px;
+    right: 10px;
+    border-radius: 100%;
+    border: 1px dashed hsl(0, 0%, 25%);
+  }
+
+  .hc-attachments-upload-area:hover & {
+    opacity: 1;
+  }
+}
 </style>
diff --git a/webapp/components/Upload/index.vue b/webapp/components/Upload/index.vue
index f7f730632..3f84f8a7c 100644
--- a/webapp/components/Upload/index.vue
+++ b/webapp/components/Upload/index.vue
@@ -9,7 +9,7 @@
       @vdropzone-error="verror"
     >
       <div class="dz-message" @mouseover="hover = true" @mouseleave="hover = false">
-        <hc-avatar :user="user" class="profile-avatar" size="x-large"></hc-avatar>
+        <slot></slot>
         <div class="hc-attachments-upload-area">
           <div class="hc-drag-marker">
             <ds-icon v-if="hover" name="image" size="xxx-large" />
@@ -22,12 +22,10 @@
 <script>
 import vueDropzone from 'nuxt-dropzone'
 import gql from 'graphql-tag'
-import HcAvatar from '~/components/Avatar/Avatar.vue'
 
 export default {
   components: {
     vueDropzone,
-    HcAvatar,
   },
   props: {
     user: { type: Object, default: null },
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index 108cead09..a5781032b 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -3,9 +3,7 @@
     <ds-flex-item :width="{ base: '100%', md: 3 }">
       <hc-contribution-form />
     </ds-flex-item>
-    <ds-flex-item :width="{ base: '100%', md: 1 }">
-      &nbsp;
-    </ds-flex-item>
+    <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
   </ds-flex>
 </template>
 
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index eedcd199b..f5c5f8745 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -10,7 +10,9 @@
           :class="{ 'disabled-content': user.disabled }"
           style="position: relative; height: auto;"
         >
-          <hc-upload v-if="myProfile" :user="user" />
+          <hc-upload v-if="myProfile" :user="user">
+            <hc-avatar :user="user" class="profile-avatar" size="x-large"></hc-avatar>
+          </hc-upload>
           <hc-avatar v-else :user="user" class="profile-avatar" size="x-large" />
           <no-ssr>
             <content-menu