diff --git a/src/_services/app.service.js b/src/_services/app.service.js
index 7e323d6..3ebf0a0 100644
--- a/src/_services/app.service.js
+++ b/src/_services/app.service.js
@@ -8,6 +8,7 @@ export const appService = {
 
     getAppsByUserId,
     getAppByUserId,
+    getAppAssetByUserId,
     enableAppByUserId,
     disableAppByUserId,
 
@@ -47,6 +48,10 @@ function getAppByUserId(userId, appId, messages, errors) {
     return fetch(`${config.apiUrl}/users/${userId}/apps/${appId}`, util.getWithAuth()).then(util.handleCrudResponse(messages, errors));
 }
 
+function getAppAssetByUserId(userId, appId, assetId, messages, errors) {
+    return fetch(`${config.apiUrl}/users/${userId}/apps/${appId}/assets/${assetId}`, util.getWithAuth()).then(util.handlePlaintextResponse(messages, errors));
+}
+
 function enableAppByUserId(userId, appId, messages, errors) {
     return fetch(`${config.apiUrl}/users/${userId}/apps/${appId}/enable`, util.postWithAuth()).then(util.handleCrudResponse(messages, errors));
 }
diff --git a/src/_store/apps.module.js b/src/_store/apps.module.js
index 93a39c7..ff5ff0b 100644
--- a/src/_store/apps.module.js
+++ b/src/_store/apps.module.js
@@ -11,6 +11,7 @@ const state = {
     mitmEnabled: null,
     error: null,
     apps: [],
+    icons: {},
     app: null,
     sites: [],
     site: null,
@@ -53,7 +54,29 @@ const actions = {
         commit('getAppsByUserIdRequest');
         appService.getAppsByUserId(userId, messages, errors)
             .then(
-                apps => commit('getAppsByUserIdSuccess', apps),
+                apps => {
+                    if (apps && apps.length && apps.length > 0) {
+                        for (let i=0; i<apps.length; i++) {
+                            let app = apps[i];
+                            if (typeof state.icons[app.name] === 'undefined' || state.icons[app.name] === null) {
+                                appService.getAppAssetByUserId(
+                                    userId, app.name, 'icon', messages, errors
+                                ).then(
+                                    assetData => {
+                                        if (typeof app.assets === 'undefined' || app.assets === null) {
+                                            app.assets = {};
+                                        }
+                                        console.log('setting app icon: '+app.name);
+                                        const newIcon = {};
+                                        newIcon[app.name] = assetData;
+                                        state.icons = Object.assign({}, state.icons, newIcon);
+                                    }
+                                );
+                            }
+                        }
+                    }
+                    commit('getAppsByUserIdSuccess', apps);
+                },
                 error => commit('getAppsByUserIdFailure', error)
             );
     },
diff --git a/src/account/AppDataViewPage.vue b/src/account/AppDataViewPage.vue
index 120df09..08e13ea 100644
--- a/src/account/AppDataViewPage.vue
+++ b/src/account/AppDataViewPage.vue
@@ -3,12 +3,12 @@
         <h2>{{messages['app_'+app.name+'_name']}} - {{messages['app_'+app.name+'_view_'+viewId]}}</h2>
 
         <table v-if="app && viewParams && viewParams.length > 0">
-            <tr v-for="param in viewParams">
+            <tr v-for="param in viewParams" v-bind:key="param.name">
                 <td>{{messages['app_'+app.name+'_param_'+param.name]}}: </td>
                 <td v-if="param.name === 'device'">
                     <select v-model="paramValues[param.name]" v-if="devices">
                         <option value="">{{messages.option_all_devices}}</option>
-                        <option v-for="device in devices" :value="device.uuid">{{device.name}}</option>
+                        <option v-for="device in devices" :value="device.uuid" v-bind:key="device.name">{{device.name}}</option>
                     </select>
                 </td>
                 <td v-else>
@@ -22,8 +22,8 @@
 
         <div v-if="viewDetails && appData && appData.results && appData.results.length && appData.results.length > 0">
             <div v-if="viewDetails.layout === 'tiles'">
-                <div v-for="row in appData.results">
-                    <field-display v-for="field in viewFields"
+                <div v-for="row in appData.results" v-bind:key="row.uuid">
+                    <field-display v-for="field in viewFields" v-bind:key="field.name"
                                    :messagePrefix="'app_'+app.name+'_field_'"
                                    :showLabel="true"
                                    :customDateMessagePrefix="'app_'+app.name+'_view_'+viewId+'_'"
@@ -32,7 +32,7 @@
                                    :longTextExpandable="false"></field-display>
 
                     <div v-if="typeof app.dataConfig.actions !== 'undefined' && app.dataConfig.actions !== null && app.dataConfig.actions.length > 0">
-                        <span v-for="action in app.dataConfig.actions">
+                        <span v-for="action in app.dataConfig.actions" v-bind:key="action.name">
                             <button v-if="actionIsAvailable(action, row)" @click="dataAction(action, row)">{{messages['app_'+app.name+'_action_'+action.name]}}</button>
                         </span>
                     </div>
@@ -45,13 +45,13 @@
                 <table v-if="app && viewFields && viewFields.length > 0" border="1">
                     <thead>
                     <tr>
-                        <th v-for="field in viewFields">{{messages['app_'+app.name+'_field_'+field.name]}}</th>
+                        <th v-for="field in viewFields" v-bind:key="field.name">{{messages['app_'+app.name+'_field_'+field.name]}}</th>
                         <th v-if="app.dataConfig.actions && app.dataConfig.actions.length && app.dataConfig.actions.length > 0">{{messages.message_data_actions}}</th>
                     </tr>
                     </thead>
                     <tbody v-if="appData && appData.results && appData.results.length && appData.results.length > 0">
-                    <tr v-for="row in appData.results">
-                        <td v-for="field in viewFields" nowrap="nowrap">
+                    <tr v-for="row in appData.results" v-bind:key="row.uuid">
+                        <td v-for="field in viewFields" nowrap="nowrap" v-bind:key="field.name">
                             <field-display :messagePrefix="'app_'+app.name+'_field_'"
                                            :customDateMessagePrefix="'app_'+app.name+'_view_'+viewId+'_'"
                                            :thing="row"
@@ -59,7 +59,7 @@
                                            :longTextExpandable="false"></field-display>
                         </td>
                         <td v-if="app.dataConfig.actions && app.dataConfig.actions.length && app.dataConfig.actions.length > 0">
-                            <div v-for="action in app.dataConfig.actions">
+                            <div v-for="action in app.dataConfig.actions" v-bind:key="action.name">
                                 <button v-if="actionIsAvailable(action, row)" @click="dataAction(action, row)">{{messages['app_'+app.name+'_action_'+action.name]}}</button>
                             </div>
                         </td>
diff --git a/src/account/AppsPage.vue b/src/account/AppsPage.vue
index 87b6feb..cb74fb2 100644
--- a/src/account/AppsPage.vue
+++ b/src/account/AppsPage.vue
@@ -24,7 +24,9 @@
 
             <div v-for="app in apps">
                 <hr/>
-                <router-link :to="{ path: '/app/'+ app.name }"><h3>{{messages['app_'+app.name+'_name']}}</h3></router-link>
+                <router-link :to="{ path: '/app/'+ app.name }">
+                    <h3><img width="64" v-if="icons && icons[app.name]" :src="icons[app.name]"/> {{messages['app_'+app.name+'_name']}}</h3>
+                </router-link>
                 <div v-if="messages['!app_'+app.name+'_summary']"><h5>{{messages['app_'+app.name+'_summary']}}</h5></div>
                 <p>{{messages['app_'+app.name+'_description']}}</p>
                 <div>
@@ -52,7 +54,7 @@
             };
         },
         computed: {
-            ...mapState('apps', ['mitmEnabled', 'apps', 'app']),
+            ...mapState('apps', ['mitmEnabled', 'apps', 'app', 'icons']),
             ...mapState('system', ['messages'])
         },
         created () {
@@ -110,6 +112,7 @@
         },
         watch: {
             app (a) {
+                // app was enable/disabled, refresh apps
                 this.getAppsByUserId({
                     userId: this.user.uuid,
                     messages: this.messages,