diff --git a/webapp/components/Badges.vue b/webapp/components/Badges.vue
index d0cb30e91..b28412abe 100644
--- a/webapp/components/Badges.vue
+++ b/webapp/components/Badges.vue
@@ -10,17 +10,21 @@
       :key="badge.key"
       class="hc-badge-container"
     >
-      <img
+      <hc-image
         :title="badge.key"
-        :src="badge.icon"
+        :image-props="{ src: badge.icon}"
         class="hc-badge"
-      >
+      />
     </div>
   </div>
 </template>
 
 <script>
+import HcImage from './Image'
 export default {
+  components: {
+    HcImage
+  },
   props: {
     badges: {
       type: Array,
diff --git a/webapp/components/Empty.vue b/webapp/components/Empty.vue
index 8755a11bd..669676862 100644
--- a/webapp/components/Empty.vue
+++ b/webapp/components/Empty.vue
@@ -5,13 +5,13 @@
     :margin="margin"
   >
     <ds-text>
-      <img
-        :src="iconPath"
+      <hc-image
+        :image-props="{ src: `/img/empty/${this.icon}.svg` }"
         width="80"
         class="hc-empty-icon"
         style="margin-bottom: 5px"
         alt="Empty"
-      ><br>
+      /><br>
       <ds-text
         v-show="message"
         class="hc-empty-message"
@@ -24,8 +24,12 @@
 </template>
 
 <script>
+import HcImage from '~/components/Image'
 export default {
   name: 'HcEmpty',
+  components: {
+    HcImage
+  },
   props: {
     /**
      * Icon that should be shown
@@ -52,11 +56,6 @@ export default {
       type: [String, Object],
       default: 'x-large'
     }
-  },
-  computed: {
-    iconPath() {
-      return `/img/empty/${this.icon}.svg`
-    }
   }
 }
 </script>
diff --git a/webapp/components/Image/index.vue b/webapp/components/Image/index.vue
index de05c5eda..e2f504578 100644
--- a/webapp/components/Image/index.vue
+++ b/webapp/components/Image/index.vue
@@ -15,8 +15,8 @@ export default {
   },
   computed: {
     imageSrc() {
-      // TODO implement
-      return 'this should be an image source attribute'
+      const src = this.imageProps.src
+      return src.startsWith('/') ? src.replace('/', '/api/') : src
     }
   }
 }
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 92269143b..201f5eef3 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -30,11 +30,11 @@
               margin-bottom="xxx-small"
               centered
             >
-              <img
+              <hc-image
                 class="login-image"
-                src="/img/sign-up/humanconnection.svg"
                 alt="Human Connection"
-              >
+                :image-props="{ src: '/img/sign-up/humanconnection.svg' }" 
+              />
             </ds-space>
           </ds-flex-item>
           <ds-flex-item
@@ -96,12 +96,14 @@
 
 <script>
 import LocaleSwitch from '~/components/LocaleSwitch'
+import HcImage from '~/components/Image'
 
 import gql from 'graphql-tag'
 
 export default {
   components: {
-    LocaleSwitch
+    LocaleSwitch,
+    HcImage
   },
   layout: 'blank',
   data() {
diff --git a/webapp/pages/logout.vue b/webapp/pages/logout.vue
index 008908360..1dc088c61 100644
--- a/webapp/pages/logout.vue
+++ b/webapp/pages/logout.vue
@@ -11,11 +11,11 @@
           margin-bottom="xxx-small"
           centered
         >
-          <img
+          <hc-image
             style="width: 200px;"
-            src="/img/sign-up/onourjourney.png"
+            :image-props="imageProps"
             alt="Human Connection"
-          >
+          />
         </ds-space>
         <ds-space
           style="text-align: center;"
@@ -36,8 +36,17 @@
 </template>
 
 <script>
+import HcImage from '~/components/Image'
 export default {
+  components: {
+    HcImage
+  },
   layout: 'blank',
+  computed: {
+    imageProps() {
+      return { src: '/img/sign-up/onourjourney.png' }
+    }
+  },
   async beforeCreate() {
     await this.$store.dispatch('auth/logout')
     this.$router.replace('/')
diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 462e9af96..95a61bdd8 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -14,12 +14,12 @@
             :href="link.url"
             target="_blank"
           >
-            <img
-              :src="link.favicon"
+            <hc-image
+              :image-props="{ src: link.favicon }"
               alt="Social Media link"
               width="16"
               height="16"
-            >
+            />
             {{ link.url }}
           </a>
           &nbsp;&nbsp; <span class="layout-leave-active">|</span> &nbsp;&nbsp;
@@ -61,8 +61,12 @@
 <script>
 import gql from 'graphql-tag'
 import { mapGetters, mapMutations } from 'vuex'
+import HcImage from '~/components/Image'
 
 export default {
+  components: {
+    HcImage
+  },
   data() {
     return {
       value: ''