diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml
index 42c4a00d15..8a0e053d2f 100644
--- a/interface/resources/qml/hifi/AvatarApp.qml
+++ b/interface/resources/qml/hifi/AvatarApp.qml
@@ -33,19 +33,7 @@ Rectangle {
             emitSendToScript({'method' : getAvatarsMethod});
         } else if(message.method === getAvatarsMethod) {
             var getAvatarsReply = message.reply;
-            var i = 0;
-
-            for(var avatarName in getAvatarsReply.bookmarks) {
-                var avatarEntry = {
-                    'name' : avatarName,
-                    'url' : Qt.resolvedUrl(allAvatars.urls[i++ % allAvatars.urls.length]),
-                    'wearables' : getAvatarsReply.bookmarks[avatarName].avatarEntites ? getAvatarsReply.bookmarks[avatarName].avatarEntites : [],
-                    'entry' : getAvatarsReply.bookmarks[avatarName],
-                    'getMoreAvatars' : false
-                };
-
-                allAvatars.append(avatarEntry);
-            }
+            allAvatars.populate(getAvatarsReply.bookmarks);
 
             var currentAvatar = getAvatarsReply.currentAvatar;
             console.debug('currentAvatar: ', JSON.stringify(currentAvatar, null, '\t'));
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
index d736737f3a..2e7522183e 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
@@ -3,58 +3,26 @@ import QtQuick 2.9
 ListModel {
     id: model
 
-    property var urls: [
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d.png',
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-1.png',
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-2.png',
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-3.png',
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-4.png',
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-5.png',
-        '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-5.png',
-    ]
+    function populate(bookmarks) {
+        for(var avatarName in bookmarks) {
+            var splittedUrl = bookmarks[avatarName].avatarUrl.split('/');
+            var marketId = splittedUrl[splittedUrl.length - 2];
+            var indexOfVSuffix = marketId.indexOf('-v');
+            if(indexOfVSuffix !== -1) {
+                marketId = marketId.substring(0, indexOfVSuffix);
+            }
+            var avatarThumbnailUrl = "https://hifi-metaverse.s3-us-west-1.amazonaws.com/marketplace/previews/%marketId%/medium/hifi-mp-%marketId%.jpg"
+                .split('%marketId%').join(marketId);
 
-    /*
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d.png'
-        name: 'Woody'
-        wearables: ''
-        favorite: false
+            var avatarEntry = {
+                'name' : avatarName,
+                'url' : avatarThumbnailUrl,
+                'wearables' : bookmarks[avatarName].avatarEntites ? bookmarks[avatarName].avatarEntites : [],
+                'entry' : bookmarks[avatarName],
+                'getMoreAvatars' : false
+            };
+
+            append(avatarEntry);
+        }
     }
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-1.png'
-        name: 'Damien'
-        wearables: ''
-        favorite: false
-    }
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-2.png'
-        name: 'Lexi'
-        wearables: ''
-        favorite: false
-    }
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-3.png'
-        name: 'Judie'
-        wearables: ''
-        favorite: true
-    }
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-4.png'
-        name: 'Alex'
-        wearables: ''
-        favorite: true
-    }
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-5.png'
-        name: 'Matthew'
-        wearables: ''
-        favorite: true
-    }
-    ListElement {
-        url: '../../images/samples/hifi-mp-e76946cc-c272-4adf-9bb6-02cde0a4b57d-5.png'
-        name: 'Ogre'
-        wearables: ''
-        favorite: true
-    }
-    */
 }