diff --git a/src/components/ElTiptap.vue b/src/components/ElTiptap.vue
index 3f409c0c..65a768d5 100644
--- a/src/components/ElTiptap.vue
+++ b/src/components/ElTiptap.vue
@@ -138,6 +138,28 @@ export default {
       }
     }
 
+    .image-view {
+      display: inline-block;
+      line-height: 0;
+      margin: 0 .2rem;
+      max-width: 100%;
+      position: relative;
+      user-select: none;
+      vertical-align: baseline;
+
+      &--focused {
+        &::before {
+          border: 2px solid #b3d8ff;;
+          bottom: 0;
+          content: '';
+          left: 0;
+          position: absolute;
+          right: 0;
+          top: 0;
+        }
+      }
+    }
+
     hr {
       margin-top: 20px;
       margin-bottom: 20px;
diff --git a/src/components/MenuBar/ImageUploadCommandButton.vue b/src/components/MenuBar/ImageUploadCommandButton.vue
new file mode 100644
index 00000000..8cbb04bb
--- /dev/null
+++ b/src/components/MenuBar/ImageUploadCommandButton.vue
@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <command-button
+      tooltip="Image"
+      icon="image"
+      @click.native="imageUploadDialogVisible = true"
+    />
+
+    <el-dialog title="Upload image" :visible.sync="imageUploadDialogVisible">
+      <el-upload
+        :http-request="uploadImage"
+        :show-file-list="false"
+        class="image-upload"
+        action="#"
+        drag
+        accept="image/*"
+      >
+        <div class="image-upload__icon">
+          <i class="fa fa-upload" />
+        </div>
+        <div class="el-upload__text">
+          Choose an image file or drag it here
+        </div>
+      </el-upload>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { readFileDataUrl } from '@/utils/shared';
+
+import CommandButton from './CommandButton';
+
+export default {
+  name: 'ImageUploadCommandButton',
+
+  components: {
+    CommandButton,
+  },
+
+  props: {
+    editorContext: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  data () {
+    return {
+      imageUploadDialogVisible: false,
+    };
+  },
+
+  methods: {
+    uploadImage (uploadOptions) {
+      const { file } = uploadOptions;
+
+      readFileDataUrl(file)
+        .then((url) => {
+          this.editorContext.commands.image({ src: url });
+
+          this.imageUploadDialogVisible = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.el-upload {
+  display: flex;
+  width: 100%;
+
+  .el-upload-dragger {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    justify-content: center;
+    height: 300px;
+    width: auto;
+
+    .image-upload__icon {
+      font-size: 50px;
+      margin-bottom: 10px;
+    }
+
+    &:hover {
+      .image-upload__icon {
+        color: #409EFF;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/MenuBar/index.vue b/src/components/MenuBar/index.vue
index d985d046..1c527d44 100644
--- a/src/components/MenuBar/index.vue
+++ b/src/components/MenuBar/index.vue
@@ -43,6 +43,10 @@
         icon="link"
       />
 
+      <image-upload-command-button
+        :editorContext="editorContext"
+      />
+
       <command-button
         :is-active="editorContext.isActive.code_block()"
         :command="editorContext.commands.code_block"
@@ -148,6 +152,7 @@ import { isTextAlignActive } from '@/extensions/text_align';
 
 import HeadingDropdown from './HeadingDropdown.vue';
 import LineHeightDropdown from './LineHeightDropdown.vue';
+import ImageUploadCommandButton from './ImageUploadCommandButton.vue';
 import CommandButton from './CommandButton.vue';
 
 export default {
@@ -157,6 +162,7 @@ export default {
     EditorMenuBar,
     HeadingDropdown,
     LineHeightDropdown,
+    ImageUploadCommandButton,
     CommandButton,
   },
 
diff --git a/src/extensions/image.js b/src/extensions/image.js
new file mode 100644
index 00000000..94a01eb2
--- /dev/null
+++ b/src/extensions/image.js
@@ -0,0 +1,81 @@
+import { Image as TiptapImage } from 'tiptap-extensions';
+import { NodeSelection } from 'prosemirror-state';
+
+export default class Image extends TiptapImage {
+  get schema () {
+    return {
+      inline: true,
+      attrs: {
+        src: {
+          default: '',
+        },
+        alt: {
+          default: '',
+        },
+        title: {
+          default: '',
+        },
+        width: {
+          default: null,
+        },
+        height: {
+          default: null,
+        },
+      },
+      group: 'inline',
+      draggable: true,
+      parseDOM: [{
+        tag: 'img[src]',
+        getAttrs: dom => {
+          const width = dom.getAttribute('width') || dom.style.width;
+          const height = dom.getAttribute('height') || dom.style.height;
+
+          return {
+            src: dom.getAttribute('src'),
+            title: dom.getAttribute('title'),
+            alt: dom.getAttribute('alt'),
+            width: parseInt(width, 10),
+            height: parseInt(height, 10),
+          };
+        },
+      } ],
+      toDOM: node => ['img', node.attrs],
+    };
+  }
+
+  get view () {
+    return {
+      name: 'ImageView',
+
+      template: `
+        <span
+          :class="{ 'image-view--focused': selected }"
+          class="image-view"
+          @click="handleImageViewClick"
+        >
+          <img
+            :src="node.attrs.src"
+            :title="node.attrs.title"
+            :alt="node.attrs.alt"
+            :width="node.attrs.width"
+            :height="node.attrs.height"
+          >
+        </span>
+      `,
+
+      props: ['node', 'view', 'getPos', 'selected'],
+
+      methods: {
+        // https://github.com/scrumpy/tiptap/issues/361#issuecomment-540299541
+        handleImageViewClick () {
+          let tr = this.view.state.tr;
+          const pos = this.getPos();
+          let pos1 = this.view.state.doc.resolve(pos);
+          let selection = new NodeSelection(pos1);
+          tr.setSelection(selection);
+          this.view.dispatch(tr);
+        },
+      },
+    };
+  }
+}
diff --git a/src/extensions/index.js b/src/extensions/index.js
index d67367cf..962ad63b 100644
--- a/src/extensions/index.js
+++ b/src/extensions/index.js
@@ -3,6 +3,7 @@ export { default as Paragraph } from './paragraph';
 export { default as Heading } from './heading';
 export { default as Blockquote } from './blockquote';
 export { default as ListItem } from './list_item';
+export { default as Image } from './image';
 
 // extensions
 export { default as TextAlign } from './text_align';
diff --git a/src/main.js b/src/main.js
index 35e26ea9..32fbd331 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,12 +10,13 @@ import {
   DropdownMenu,
   DropdownItem,
   MessageBox,
+  Dialog,
+  Upload,
 } from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 
 import App from './App.vue';
 import router from './router';
-import './style/index.scss';
 
 Vue.config.productionTip = false;
 
@@ -26,6 +27,8 @@ Vue.use(Tooltip);
 Vue.use(Dropdown);
 Vue.use(DropdownMenu);
 Vue.use(DropdownItem);
+Vue.use(Dialog);
+Vue.use(Upload);
 
 Vue.prototype.$prompt = MessageBox.prompt;
 
diff --git a/src/utils/shared.js b/src/utils/shared.js
index 4121fca4..c72508f0 100644
--- a/src/utils/shared.js
+++ b/src/utils/shared.js
@@ -9,3 +9,14 @@ export function clamp (val, min, max) {
   }
   return val;
 }
+
+export function readFileDataUrl (file) {
+  const reader = new FileReader();
+
+  return new Promise((resolve, reject) => {
+    reader.onload = readerEvent => resolve(readerEvent.target.result);
+    reader.onerror = reject;
+
+    reader.readAsDataURL(file);
+  });
+}
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 31703578..fdb1d911 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -39,6 +39,7 @@ import {
   Heading,
   Blockquote,
   ListItem,
+  Image,
 
   TextAlign,
   Indent,
@@ -72,6 +73,7 @@ export default {
         new Italic(),
         new Strike(),
         new Link(),
+        new Image(),
 
         new Blockquote(),
         new CodeBlock(),
diff --git a/vue.config.js b/vue.config.js
index eae8e668..812461ef 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 
 module.exports = {
+  runtimeCompiler: true,
   chainWebpack: config => {
     config.resolve.alias
       .set('@', path.resolve(__dirname, 'src'))