diff --git a/client/index.html b/client/index.html
index 19347652..53b85083 100644
--- a/client/index.html
+++ b/client/index.html
@@ -8,6 +8,14 @@
     <link href='https://fonts.googleapis.com/css?family=Material+Icons' rel="stylesheet" type="text/css">
     <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,800" rel="stylesheet">
     <link href="https://use.typekit.net/tck7ptw.css" rel="stylesheet">
+
+    <script>
+      UPLOADCARE_LOCALE = "de";
+      UPLOADCARE_TABS = "file url facebook gdrive gphotos dropbox instagram evernote flickr skydrive";
+      UPLOADCARE_PUBLIC_KEY = "ad89e9f42d4f5532d176";
+    </script>
+    <script charset="utf-8" src="//ucarecdn.com/libs/widget/3.6.0/uploadcare.full.min.js"></script>
+
 </head>
 <body>
 <div id="app">
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index 2fcdc62a..5e2af3ff 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -36,6 +36,7 @@
   import BasicKnowledgeWidget from '@/components/content-blocks/BasicKnowledgeWidget';
   import Task from '@/components/content-blocks/Task';
   import ImageBlock from '@/components/content-blocks/ImageBlock';
+  import ImageUrlBlock from '@/components/content-blocks/ImageUrlBlock';
   import VideoBlock from '@/components/content-blocks/VideoBlock';
   import LinkBlock from '@/components/content-blocks/LinkBlock';
   import DocumentBlock from '@/components/content-blocks/DocumentBlock';
@@ -53,6 +54,7 @@
       'basic_knowledge': BasicKnowledgeWidget,
       'student_entry': StudentEntry,
       'image_block': ImageBlock,
+      'image_url_block': ImageUrlBlock,
       'video_block': VideoBlock,
       'link_block': LinkBlock,
       'document_block': DocumentBlock,
diff --git a/client/src/components/content-block-form/ContentBlockForm.vue b/client/src/components/content-block-form/ContentBlockForm.vue
index eb9a5058..c89052f3 100644
--- a/client/src/components/content-block-form/ContentBlockForm.vue
+++ b/client/src/components/content-block-form/ContentBlockForm.vue
@@ -17,6 +17,7 @@
         v-on:link-change-text="changeLinkText"
         v-on:text-change-value="changeTextValue"
         v-on:document-change-url="changeDocumentUrl"
+        v-on:image-change-url="changeImageUrl"
         v-on:video-change-url="changeVideoUrl">
       </component>
       <a class="content-block-form__remove" v-on:click="removeElement(index)">
@@ -81,7 +82,7 @@
             return 'link-form';
           case 'video_block':
             return 'video-form';
-          case 'image_block':
+          case 'image_url_block':
             return 'image-form';
           case 'text_block':
             return 'text-form';
@@ -112,6 +113,9 @@
       changeVideoUrl(value, index) {
         this._updateProperty(value, index, 'url')
       },
+      changeImageUrl(value, index) {
+        this._updateProperty(value, index, 'url')
+      },
       changeDocumentUrl(value, index) {
         this._updateProperty(value, index, 'url')
       },
@@ -167,6 +171,12 @@
               }
             };
             break;
+          case 'image_url_block':
+            el = {
+              ...el,
+              url: ''
+            };
+            break;
         }
 
         this.localContentBlock.contents.splice(index, 1, el);
diff --git a/client/src/components/content-blocks/ImageUrlBlock.vue b/client/src/components/content-blocks/ImageUrlBlock.vue
new file mode 100644
index 00000000..f22cbe2b
--- /dev/null
+++ b/client/src/components/content-blocks/ImageUrlBlock.vue
@@ -0,0 +1,19 @@
+<template>
+    <img :src="value.url" alt="" class="image-block">
+</template>
+
+<script>
+  export default {
+    props: ['value']
+  }
+</script>
+
+<style scoped lang="scss">
+  .image-block {
+    width: 100%;
+    max-width: 100%;
+    border-radius: 13px;
+
+    margin-bottom: 30px;
+  }
+</style>
diff --git a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
index 87cd08e7..434589af 100644
--- a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
+++ b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue
@@ -8,7 +8,7 @@
       <video-icon class="content-block-element-chooser-widget__link-icon"></video-icon>
       <div class="content-block-element-chooser-widget__link-title">Video</div>
     </div>
-    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'image_block')">
+    <div class="content-block-element-chooser-widget__link" v-on:click="$emit('change-type', index, 'image_url_block')">
       <image-icon class="content-block-element-chooser-widget__link-icon"></image-icon>
       <div class="content-block-element-chooser-widget__link-title">Bild</div>
     </div>
diff --git a/client/src/components/content-forms/ImageForm.vue b/client/src/components/content-forms/ImageForm.vue
index 0a1203c5..83e8be89 100644
--- a/client/src/components/content-forms/ImageForm.vue
+++ b/client/src/components/content-forms/ImageForm.vue
@@ -1,11 +1,26 @@
 <template>
   <div class="image-form">
-    <input id="image-input" type="file" class="image-form__file-input">
-    <label class="image-form__button" for="image-input">Bild vom Computer hochladen</label>
+    <input type="hidden" ref="widget">
   </div>
 </template>
 
 <script>
+  import uploadcare from 'uploadcare-widget';
+
+  export default {
+    props: ['url', 'index'],
+    mounted() {
+      console.log('ImageForm mounted');
+      console.log(this.$refs);
+      const widget = uploadcare.Widget(this.$refs.widget);
+
+      widget.onUploadComplete(info => {
+        console.log(info);
+        console.log(info.cdnUrl);
+        this.$emit('link-change-url', info.cdnUrl, this.index)
+      });
+    }
+  }
 </script>
 
 <style scoped lang="scss">
diff --git a/package-lock.json b/package-lock.json
index ef862fe6..a3e2198a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,6 +35,11 @@
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
       "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
     },
+    "jquery": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+    },
     "regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -44,6 +49,14 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-3.1.1.tgz",
       "integrity": "sha512-syDl3htvM56w0HC0PTVA5jEEknOCJ3dWgWGDuaEtQUno8ORDCfZQbm12RzfWO3AC3YhWDoP61dlgmo8Z05Y97g=="
+    },
+    "uploadcare-widget": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/uploadcare-widget/-/uploadcare-widget-3.6.0.tgz",
+      "integrity": "sha512-QWvZtPG35ndZJfNxKSu+rrzgIPK+UhO4KzWntP9zfJBvaT1xdbIIF/OMYBhNFG5dbw5j7qFIS2SJvtZZAK9rfw==",
+      "requires": {
+        "jquery": ">=1.10.2"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index cf540ff8..ecd25ddc 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "babel-polyfill": "^6.26.0",
-    "unfetch": "^3.0.0"
+    "unfetch": "^3.0.0",
+    "uploadcare-widget": "3.6.0"
   }
 }
diff --git a/server/book/migrations/0003_auto_20180918_1605.py b/server/book/migrations/0003_auto_20180918_1605.py
new file mode 100644
index 00000000..5c3cf5e4
--- /dev/null
+++ b/server/book/migrations/0003_auto_20180918_1605.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.0.6 on 2018-09-18 16:05
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('book', '0002_auto_20180913_0738'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentblock',
+            name='contents',
+            field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='doc-full')), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='placeholder')), ('student_entry', wagtail.core.blocks.StructBlock([('task_text', wagtail.core.blocks.RichTextBlock())], icon='download')), ('image_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='image')), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='link')), ('task', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='tick')), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())], icon='media')), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())], icon='doc-full'))], blank=True, null=True),
+        ),
+    ]
diff --git a/server/book/models/contentblock.py b/server/book/models/contentblock.py
index 40217ecd..d645ef39 100644
--- a/server/book/models/contentblock.py
+++ b/server/book/models/contentblock.py
@@ -5,7 +5,8 @@ from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList,
 from wagtail.core.fields import StreamField
 from wagtail.images.blocks import ImageChooserBlock
 
-from book.blocks import TextBlock, BasicKnowledgeBlock, StudentEntryBlock, LinkBlock, VideoBlock, DocumentBlock
+from book.blocks import TextBlock, BasicKnowledgeBlock, StudentEntryBlock, LinkBlock, VideoBlock, DocumentBlock, \
+    ImageUrlBlock
 from core.wagtail_utils import StrictHierarchyPage
 from user.models import UserGroup
 
@@ -36,6 +37,7 @@ class ContentBlock(StrictHierarchyPage):
         ('basic_knowledge', BasicKnowledgeBlock(icon='placeholder')),
         ('student_entry', StudentEntryBlock(icon='download')),
         ('image_block', ImageChooserBlock(icon='image')),
+        ('image_url_block', ImageUrlBlock(icon='image')),
         ('link_block', LinkBlock(icon='link')),
         ('task', TextBlock(icon='tick')),
         ('video_block', VideoBlock(icon='media')),
diff --git a/server/book/schema/inputs.py b/server/book/schema/inputs.py
index 67c77d94..c2ced706 100644
--- a/server/book/schema/inputs.py
+++ b/server/book/schema/inputs.py
@@ -7,6 +7,7 @@ class InputTypes(graphene.Enum):
     # basic_knowledge = 'basic_knowledge' # probably won't be using this over the API
     student_entry = 'student_entry'
     image_block = 'image_block'
+    image_url_block = 'image_url_block'
     link_block = 'link_block'
     task = 'task'
     video_block = 'video_block'
diff --git a/server/book/schema/mutations.py b/server/book/schema/mutations.py
index 7c519876..747e2a82 100644
--- a/server/book/schema/mutations.py
+++ b/server/book/schema/mutations.py
@@ -25,8 +25,12 @@ def handle_content_blocks(content_data):
                 }})
         elif content['type'] == 'student_entry':
             pass
-        elif content['type'] == 'image_block':
-            pass
+        elif content['type'] == 'image_url_block':
+            new_contents.append({
+                'type': 'image_url_block',
+                'value': {
+                    'url': bleach.clean(content['url'])
+                }})
         elif content['type'] == 'link_block':
             new_contents.append({
                 'type': 'link_block',
diff --git a/server/book/tests/test_module_mutations.py b/server/book/tests/test_module_mutations.py
index 44eebadd..9fa8f9e9 100644
--- a/server/book/tests/test_module_mutations.py
+++ b/server/book/tests/test_module_mutations.py
@@ -1,8 +1,4 @@
-import io
-import os
-
 from django.test import TestCase
-
 from graphene.test import Client
 from graphql_relay import to_global_id
 
@@ -11,8 +7,6 @@ from api.utils import get_graphql_mutation, get_object
 from book.factories import ContentBlockFactory
 from book.models import ContentBlock
 
-from django.conf import settings
-
 
 class NewContentBlockMutationTest(TestCase):
     def setUp(self):
@@ -52,3 +46,33 @@ class NewContentBlockMutationTest(TestCase):
         content_block_page = get_object(ContentBlock, id)
 
         self.assertEqual(content_block_page.title, title)
+
+    def test_addNewContentBlock_withImageUrlBlock(self):
+        self.assertEqual(ContentBlock.objects.count(), 1)
+        client = Client(schema=schema)
+
+        mutation = get_graphql_mutation('addContentBlock.gql')
+
+        title = "Hello World"
+
+        result = client.execute(mutation, variables={
+            'input': {
+                "contentBlock": {
+                    "title": title,
+                    "contents": [
+                        {
+                            "type": "image_url_block",
+                            "url": "/test.png"
+                        }
+                    ]
+                },
+                "after": self.sibling_id
+            }
+        })
+        self.assertIsNone(result.get('errors'))
+        self.assertEqual(ContentBlock.objects.count(), 2)
+
+        new_content_block = result.get('data').get('addContentBlock').get('newContentBlock')
+        self.assertEqual(new_content_block.get('title'), title)
+        self.assertEqual(len(new_content_block['contents']), 1)
+        self.assertEqual(new_content_block['contents'], [{'type': 'image_url_block', 'value': {'url': '/test.png'}}])
