diff --git a/webapp/components/Badges.vue b/webapp/components/Badges.vue
index d0cb30e91..b30dba309 100644
--- a/webapp/components/Badges.vue
+++ b/webapp/components/Badges.vue
@@ -10,22 +10,31 @@
       :key="badge.key"
       class="hc-badge-container"
     >
-      <img
+      <hc-image
         :title="badge.key"
-        :src="badge.icon"
+        :imageProps="imageProps(badge.icon)"
         class="hc-badge"
-      >
+      />
     </div>
   </div>
 </template>
 
 <script>
+import HcImage from './Image'
 export default {
+  components: {
+    HcImage
+  },
   props: {
     badges: {
       type: Array,
       default: () => []
     }
+  },
+  methods: {
+    imageProps(icon) {
+      return { src: icon}
+    }
   }
 }
 </script>
diff --git a/webapp/components/Empty.vue b/webapp/components/Empty.vue
index 8755a11bd..c1044137e 100644
--- a/webapp/components/Empty.vue
+++ b/webapp/components/Empty.vue
@@ -5,13 +5,13 @@
     :margin="margin"
   >
     <ds-text>
-      <img
-        :src="iconPath"
+      <hc-image
+        :imageProps="imageProps"
         width="80"
         class="hc-empty-icon"
         style="margin-bottom: 5px"
         alt="Empty"
-      ><br>
+      /><br>
       <ds-text
         v-show="message"
         class="hc-empty-message"
@@ -24,7 +24,11 @@
 </template>
 
 <script>
+import HcImage from '~/components/Image'
 export default {
+  components: {
+    HcImage
+  },
   name: 'HcEmpty',
   props: {
     /**
@@ -56,6 +60,9 @@ export default {
   computed: {
     iconPath() {
       return `/img/empty/${this.icon}.svg`
+    },
+    imageProps: {
+      src: iconPath
     }
   }
 }
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 846191c40..951aa10a6 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"
-              >
+                :imageProps="imageProps" 
+              />
             </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() {
@@ -116,6 +118,9 @@ export default {
   computed: {
     pending() {
       return this.$store.getters['auth/pending']
+    },
+    imageProps() {
+      return {src:"/img/sign-up/humanconnection.svg"}
     }
   },
   asyncData({ store, redirect }) {
diff --git a/webapp/pages/logout.vue b/webapp/pages/logout.vue
index 008908360..54585d599 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"
+            :imageProps="imageProps"
             alt="Human Connection"
-          >
+          />
         </ds-space>
         <ds-space
           style="text-align: center;"
@@ -36,11 +36,20 @@
 </template>
 
 <script>
+import HcImage from '~/components/Image'
 export default {
+  components: {
+    HcImage
+  },
   layout: 'blank',
   async beforeCreate() {
     await this.$store.dispatch('auth/logout')
     this.$router.replace('/')
+  },
+  computed: {
+    imageProps(){
+      return { src: "/img/sign-up/onourjourney.png"}
+    }
   }
 }
 </script>
diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index c031f54a4..c13d0eeb5 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -11,12 +11,12 @@
           :key="link.url"
         >
           <a :href="link.url">
-            <img
-              :src="link.favicon"
+            <hc-image
+              :imageProps="imageProps(link.favicon)"
               alt="Social Media link"
               width="16"
               height="16"
-            >
+            />
             {{ link.url }}
           </a>
         </ds-list-item>
@@ -45,8 +45,12 @@
 <script>
 import gql from 'graphql-tag'
 import { mapGetters, mapMutations } from 'vuex'
+import HcImage from '~/components/Image'
 
 export default {
+  components: {
+    HcImage
+  },
   data() {
     return {
       value: ''
@@ -101,6 +105,9 @@ export default {
           this.$toast.success(this.$t('settings.social-media.success')),
           (this.value = '')
         )
+    },
+    imageProps(favicon) {
+      return { src: favicon}
     }
   }
 }