diff --git a/dashboard/src/components/app/Display.vue b/dashboard/src/components/app/Display.vue
new file mode 100644
index 000000000..ebe2e9385
--- /dev/null
+++ b/dashboard/src/components/app/Display.vue
@@ -0,0 +1,164 @@
+<script setup>
+
+import { ref, onMounted, useTemplateRef } from 'vue';
+import { FormGroup, TextInput, Button, TagInput } from 'pankow';
+import AppsModel from '../../models/AppsModel.js';
+
+const props = defineProps([ 'app' ]);
+
+const appsModel = AppsModel.create();
+
+let iconChanged = false;
+
+const busy = ref(false);
+const labelError = ref('');
+const tagsError = ref('');
+const iconError = ref('');
+const label = ref('');
+const tags = ref([]);
+const iconUrl = ref('');
+const iconFileInput = useTemplateRef('iconFileInput');
+
+function onResetIcon() {
+  const accessToken = localStorage.token;
+
+  iconChanged = true;
+  iconUrl.value = props.app.iconUrl + '&original=true&access_token=' + accessToken;
+}
+
+function onShowIconSelector() {
+  iconFileInput.value.click();
+}
+
+function onIconChanged(event) {
+  const fr = new FileReader();
+  fr.onload = function () {
+    const image = new Image();
+    image.onload = function () {
+      const size = 512;
+
+      const canvas = document.createElement('canvas');
+      canvas.width = size;
+      canvas.height = size;
+
+      const imageDimensionRatio = image.width / image.height;
+      const canvasDimensionRatio = canvas.width / canvas.height;
+      let renderableHeight, renderableWidth, xStart, yStart;
+
+      if (imageDimensionRatio > canvasDimensionRatio) {
+        renderableHeight = canvas.height;
+        renderableWidth = image.width * (renderableHeight / image.height);
+        xStart = (canvas.width - renderableWidth) / 2;
+        yStart = 0;
+      } else if (imageDimensionRatio < canvasDimensionRatio) {
+        renderableWidth = canvas.width;
+        renderableHeight = image.height * (renderableWidth / image.width);
+        xStart = 0;
+        yStart = (canvas.height - renderableHeight) / 2;
+      } else {
+        renderableHeight = canvas.height;
+        renderableWidth = canvas.width;
+        xStart = 0;
+        yStart = 0;
+      }
+
+      var ctx = canvas.getContext('2d');
+      ctx.clearRect(0, 0, canvas.width, canvas.height);
+      ctx.drawImage(image, xStart, yStart, renderableWidth, renderableHeight);
+
+      iconUrl.value = canvas.toDataURL('image/png');
+      iconChanged = true;
+    };
+
+    image.src = fr.result;
+  };
+  fr.readAsDataURL(event.target.files[0]);
+}
+
+async function onSubmit() {
+  busy.value = true;
+  labelError.value = '';
+  tagsError.value = '';
+  iconError.value = '';
+
+  if (label.value !== props.app.label) {
+    const [error] = await appsModel.configure(props.app.id, 'label', { label: label.value });
+    if (error) {
+      labelError.value = error.body ? error.body.message : 'Internal error';
+      busy.value = false;
+      return console.error(error);
+    }
+  }
+
+  if (tags.value.join() !== props.app.tags.join()) {
+    const [error] = await appsModel.configure(props.app.id, 'tags', { tags: tags.value });
+    if (error) {
+      tagsError.value = error.body ? error.body.message : 'Internal error';
+      busy.value = false;
+      return console.error(error);
+    }
+  }
+
+  if (iconChanged) {
+    let tmp;
+    if (iconUrl.value.indexOf('data:image') === 0) {
+      tmp = iconUrl.value.replace(/^data:image\/[a-z]+;base64,/, '');
+    } else {
+      tmp = '';
+    }
+
+    const [error] = await appsModel.configure(props.app.id, 'icon', { icon: tmp });
+    if (error) {
+      iconError.value = error.body ? error.body.message : 'Internal error';
+      busy.value = false;
+      return console.error(error);
+    }
+
+    iconChanged = false;
+  }
+
+  busy.value = false;
+}
+
+onMounted(() => {
+  label.value = props.app.label;
+  tags.value = props.app.tags;
+  iconUrl.value = props.app.iconUrl;
+});
+
+</script>
+
+<template>
+  <div>
+    <form @submit.prevent="onSubmit()" autocomplete="off">
+      <fieldset :disabled="busy">
+        <input type="submit" style="display: none;"/>
+
+        <FormGroup>
+          <label for="labelInput">{{ $t('app.display.label') }}</label>
+          <TextInput id="labelInput" v-model="label"/>
+          <div class="text-error" v-if="labelError">{{ labelError }}</div>
+        </FormGroup>
+
+        <FormGroup>
+          <label for="tagsInput">{{ $t('app.display.tags') }}</label>
+          <TagInput id="tagsInput" :placeholder="$t('app.display.tagsPlaceholder')" v-model="tags" v-tooltip="$t('app.display.tagsTooltip')"/>
+          <div class="text-error" v-if="tagsError">{{ tagsError }}</div>
+        </FormGroup>
+
+        <FormGroup>
+          <label for="previewIcon">{{ $t('app.display.icon') }}</label>
+          <div id="previewIcon" class="app-custom-icon" @click="onShowIconSelector()">
+            <img :src="iconUrl" onerror="this.src = '/img/appicon_fallback.png'"/>
+            <i class="picture-edit-indicator fa fa-pencil-alt"></i>
+          </div>
+          <div class="text-error" v-if="iconError">{{ iconError }}</div>
+          <div class="actionable" @click="onResetIcon()">{{ $t('app.display.iconResetAction') }}</div>
+          <input type="file" ref="iconFileInput" @change="onIconChanged($event)" style="display: none" accept="image/webp, image/png, image/gif, image/jpeg"/>
+        </FormGroup>
+      </fieldset>
+    </form>
+    <br/>
+    <Button @click="onSubmit()" :loading="busy" :disabled="busy">{{ $t('app.display.saveAction') }}</Button>
+  </div>
+</template>
diff --git a/dashboard/src/models/AppsModel.js b/dashboard/src/models/AppsModel.js
index 6f3bd2878..77691053f 100644
--- a/dashboard/src/models/AppsModel.js
+++ b/dashboard/src/models/AppsModel.js
@@ -137,6 +137,7 @@ function create() {
       for (const app of result.body.apps) {
         app.ssoAuth = app.sso && (app.manifest.addons['ldap'] || app.manifest.addons['oidc'] || app.manifest.addons['proxyAuth']); // checking app.sso first ensures app.manifest.addons is not null
         app.type = app.manifest.id === PROXY_APP_ID ? APP_TYPES.PROXIED : APP_TYPES.APP;
+        app.iconUrl = app.iconUrl ? (origin + app.iconUrl + '?ts=' + (new Date(app.ts).getTime())) : null; // calculate full icon url with cache busting
 
          // only fetch if we have permissions and a taskId is set/active
         if (!app.taskId || (app.accessLevel !== 'operator' && app.accessLevel !== 'admin')) {
@@ -174,6 +175,7 @@ function create() {
 
       app.ssoAuth = app.sso && (app.manifest.addons['ldap'] || app.manifest.addons['oidc'] || app.manifest.addons['proxyAuth']); // checking app.sso first ensures app.manifest.addons is not null
       app.type = app.manifest.id === PROXY_APP_ID ? APP_TYPES.PROXIED : APP_TYPES.APP;
+      app.iconUrl = app.iconUrl ? (origin + app.iconUrl + '?ts=' + (new Date(app.ts).getTime())) : null; // calculate full icon url with cache busting
 
        // only fetch if we have permissions and a taskId is set/active
       if (!app.taskId || (app.accessLevel !== 'operator' && app.accessLevel !== 'admin')) {
diff --git a/dashboard/src/views/AppConfigureView.vue b/dashboard/src/views/AppConfigureView.vue
index 4866517f7..a7f6aee43 100644
--- a/dashboard/src/views/AppConfigureView.vue
+++ b/dashboard/src/views/AppConfigureView.vue
@@ -9,6 +9,7 @@ const t = i18n.t;
 import { ref, onMounted, onBeforeUnmount, computed } from 'vue';
 import { Button, ButtonGroup } from 'pankow';
 import Info from '../components/app/Info.vue';
+import Display from '../components/app/Display.vue';
 import Security from '../components/app/Security.vue';
 import Cron from '../components/app/Cron.vue';
 import Resources from '../components/app/Resources.vue';
@@ -140,7 +141,7 @@ onBeforeUnmount(() => {
     <div class="configure-inner" v-if="!busy">
       <div class="titlebar">
         <div style="display: flex; flex-grow: 1;">
-          <img :src="API_ORIGIN + app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'" style="height: 64px; width: 64px; margin-right: 10px;"/>
+          <img :src="app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'" style="height: 64px; width: 64px; margin-right: 10px;"/>
           <h2>
             <a class="applink" :href="link || null" target="_blank">{{ app.label || app.fqdn }}</a>
             <div class="statelabel">
@@ -189,7 +190,7 @@ onBeforeUnmount(() => {
         </div>
         <div class="configure-content">
           <Info v-if="view === 'info'" :app="app"/>
-          <div v-if="view === 'display'"></div>
+          <Display :app="app" v-if="view === 'display'"/>
           <div v-if="view === 'location'"></div>
           <div v-if="view === 'proxy'"></div>
           <div v-if="view === 'access'"></div>
diff --git a/dashboard/src/views/AppsView.vue b/dashboard/src/views/AppsView.vue
index 5ae2b14c8..3185286d0 100644
--- a/dashboard/src/views/AppsView.vue
+++ b/dashboard/src/views/AppsView.vue
@@ -155,7 +155,7 @@ async function refreshApps() {
     applink.installationState = ISTATES.INSTALLED;
     applink.runState = RSTATES.RUNNING;
     applink.health = HSTATES.HEALTHY;
-    applink.iconUrl = `/api/v1/applinks/${applink.id}/icon?access_token=${localStorage.token}&ts=${applink.ts}`;
+    applink.iconUrl = `${API_ORIGIN}/api/v1/applinks/${applink.id}/icon?access_token=${localStorage.token}&ts=${applink.ts}`;
     applink.accessLevel = profile.value.isAtLeastAdmin ? 'admin' : 'user';
 
     result.push(applink);
@@ -220,7 +220,7 @@ onUnmounted(() => {
       <TransitionGroup name="grid-animation" tag="div" class="grid" v-if="viewType === VIEW_TYPE.GRID">
         <a v-for="app in filteredApps" :key="app.id" class="grid-item" @click="onOpenApp(app, $event)" :href="'https://' + app.fqdn" target="_blank">
           <a class="config" v-show="isOperator(app)" @click="openAppEdit(app, $event)" :href="`#/app/${app.id}/info`"><Icon icon="fa-solid fa-cog" /></a>
-          <img :src="API_ORIGIN + app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'"/>
+          <img :src="app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'"/>
           <div class="grid-item-label">{{ app.label || app.subdomain || app.fqdn }}</div>
           <div class="grid-item-task-label">{{ installationStateLabel(app) }}</div>
           <div class="apps-progress" v-show="isOperator(app)">
@@ -233,7 +233,7 @@ onUnmounted(() => {
         <TableView :columns="listColumns" :model="filteredApps">
           <template #icon="app">
             <a :href="'https://' + app.fqdn" target="_blank">
-              <img class="list-icon" :src="API_ORIGIN + app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'"/>
+              <img class="list-icon" :src="app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'"/>
             </a>
           </template>
           <template #label="app">