diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
index a75d511793..91d2ab9f7f 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
@@ -25,10 +25,6 @@ Item {
 
     id: root;
 
-    SecurityImageModel {
-        id: securityImageModel;
-    }
-
     // Username Text
     RalewayRegular {
         id: usernameText;
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
index 7cb4a3068f..b261743434 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
@@ -26,10 +26,6 @@ Item {
     id: root;
     property bool justSubmitted: false;
 
-    SecurityImageModel {
-        id: securityImageModel;
-    }
-
     Connections {
         target: Commerce;
         
@@ -70,7 +66,7 @@ Item {
             source: "image://security/securityImage";
             cache: false;
             onVisibleChanged: {
-                Commerce.getSecurityImage();
+                commerce.getSecurityImage();
             }
         }
         Item {
@@ -198,7 +194,7 @@ Item {
                     securityImageSubmitButton.text = "Submitting...";
                     securityImageSubmitButton.enabled = false;
                     var securityImagePath = securityImageSelection.getImagePathFromImageID(securityImageSelection.getSelectedImageIndex())
-                    Commerce.chooseSecurityImage(securityImagePath);
+                    commerce.chooseSecurityImage(securityImagePath);
                 }
             }
         }
@@ -213,4 +209,8 @@ Item {
         securityImageSubmitButton.enabled = true;
         securityImageSubmitButton.text = "Submit";
     }
+
+    function initModel() {
+        securityImageSelection.initModel();
+    }
 }
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
index 7b1434aa3c..b8e9db09ab 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
@@ -15,29 +15,28 @@ import QtQuick 2.5
 
 ListModel {
     id: root;
-    ListElement{
-        sourcePath: "images/01.jpg"
-        securityImageEnumValue: 1;
+
+    function initModel() {
+        var array = [];
+        while (array.length < 6) {
+            // We currently have 34 security images to choose from
+            var randomNumber = Math.floor(Math.random() * 34) + 1;
+            if (array.indexOf(randomNumber) > -1) {
+                continue;
+            }
+            array[array.length] = randomNumber;
+        }
+
+        var modelElement;
+
+        for (var i = 0; i < 6; i++) {
+            modelElement = { "sourcePath":"images/" + addLeadingZero(array[i]) + ".jpg", "securityImageEnumValue": (i + 1) }
+            root.insert(i, modelElement);
+        }
     }
-    ListElement{
-        sourcePath: "images/02.jpg"
-        securityImageEnumValue: 2;
-    }
-    ListElement{
-        sourcePath: "images/03.jpg"
-        securityImageEnumValue: 3;
-    }
-    ListElement{
-        sourcePath: "images/04.jpg"
-        securityImageEnumValue: 4;
-    }
-    ListElement{
-        sourcePath: "images/05.jpg"
-        securityImageEnumValue: 5;
-    }
-    ListElement{
-        sourcePath: "images/06.jpg"
-        securityImageEnumValue: 6;
+
+    function addLeadingZero(n) {
+        return n < 10 ? '0' + n : '' + n;
     }
 
     function getImagePathFromImageID(imageID) {
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
index e12332cd0c..1f5e67eaa5 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
@@ -95,6 +95,10 @@ Item {
     function getSelectedImageIndex() {
         return gridModel.get(securityImageGrid.currentIndex).securityImageEnumValue;
     }
+
+    function initModel() {
+        gridModel.initModel();
+    }
     //
     // FUNCTION DEFINITIONS END
     //
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 8ebd3ecc84..98d3756ef6 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -86,10 +86,6 @@ Rectangle {
         }
     }
 
-    SecurityImageModel {
-        id: securityImageModel;
-    }
-
     HifiCommerceCommon.CommerceLightbox {
         id: lightboxPopup;
         visible: false;
@@ -348,6 +344,7 @@ Rectangle {
                     passphraseChange.clearPassphraseFields();
                     passphraseChange.resetSubmitButton();
                 } else if (msg.method === 'walletSecurity_changeSecurityImage') {
+                    securityImageChange.initModel();
                     root.activeView = "securityImageChange";
                 }
             }
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index e45b7fc3ad..afa0e19271 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -236,6 +236,7 @@ Item {
             height: 50;
             text: "Set Up Wallet";
             onClicked: {
+                securityImageSelection.initModel();
                 root.activeView = "step_2";
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/01.jpg b/interface/resources/qml/hifi/commerce/wallet/images/01.jpg
index 821be6c584..199920a32d 100644
Binary files a/interface/resources/qml/hifi/commerce/wallet/images/01.jpg and b/interface/resources/qml/hifi/commerce/wallet/images/01.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/02.jpg b/interface/resources/qml/hifi/commerce/wallet/images/02.jpg
index cfcd3e38bf..821be6c584 100644
Binary files a/interface/resources/qml/hifi/commerce/wallet/images/02.jpg and b/interface/resources/qml/hifi/commerce/wallet/images/02.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/04.jpg b/interface/resources/qml/hifi/commerce/wallet/images/04.jpg
index 82e3e64be3..1acedf8b10 100644
Binary files a/interface/resources/qml/hifi/commerce/wallet/images/04.jpg and b/interface/resources/qml/hifi/commerce/wallet/images/04.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/05.jpg b/interface/resources/qml/hifi/commerce/wallet/images/05.jpg
index c6ce0ac0a1..da73727dea 100644
Binary files a/interface/resources/qml/hifi/commerce/wallet/images/05.jpg and b/interface/resources/qml/hifi/commerce/wallet/images/05.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/06.jpg b/interface/resources/qml/hifi/commerce/wallet/images/06.jpg
index 1acedf8b10..bbd0399d3f 100644
Binary files a/interface/resources/qml/hifi/commerce/wallet/images/06.jpg and b/interface/resources/qml/hifi/commerce/wallet/images/06.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/07.jpg b/interface/resources/qml/hifi/commerce/wallet/images/07.jpg
new file mode 100644
index 0000000000..e5f86a4a80
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/07.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/08.jpg b/interface/resources/qml/hifi/commerce/wallet/images/08.jpg
new file mode 100644
index 0000000000..9d49866c91
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/08.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/09.jpg b/interface/resources/qml/hifi/commerce/wallet/images/09.jpg
new file mode 100644
index 0000000000..a1c31bce7d
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/09.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/10.jpg b/interface/resources/qml/hifi/commerce/wallet/images/10.jpg
new file mode 100644
index 0000000000..1f6fc1de27
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/10.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/11.jpg b/interface/resources/qml/hifi/commerce/wallet/images/11.jpg
new file mode 100644
index 0000000000..37c3b937a5
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/11.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/12.jpg b/interface/resources/qml/hifi/commerce/wallet/images/12.jpg
new file mode 100644
index 0000000000..39f653630c
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/12.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/13.jpg b/interface/resources/qml/hifi/commerce/wallet/images/13.jpg
new file mode 100644
index 0000000000..3ae86be465
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/13.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/14.jpg b/interface/resources/qml/hifi/commerce/wallet/images/14.jpg
new file mode 100644
index 0000000000..8de661e58e
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/14.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/15.jpg b/interface/resources/qml/hifi/commerce/wallet/images/15.jpg
new file mode 100644
index 0000000000..f0ac801b89
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/15.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/16.jpg b/interface/resources/qml/hifi/commerce/wallet/images/16.jpg
new file mode 100644
index 0000000000..f7c32a696b
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/16.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/17.jpg b/interface/resources/qml/hifi/commerce/wallet/images/17.jpg
new file mode 100644
index 0000000000..75e811ee36
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/17.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/18.jpg b/interface/resources/qml/hifi/commerce/wallet/images/18.jpg
new file mode 100644
index 0000000000..e4ca0b6f28
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/18.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/19.jpg b/interface/resources/qml/hifi/commerce/wallet/images/19.jpg
new file mode 100644
index 0000000000..4c25f3dda2
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/19.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/20.jpg b/interface/resources/qml/hifi/commerce/wallet/images/20.jpg
new file mode 100644
index 0000000000..a5a4565a87
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/20.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/21.jpg b/interface/resources/qml/hifi/commerce/wallet/images/21.jpg
new file mode 100644
index 0000000000..3747c9558e
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/21.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/22.jpg b/interface/resources/qml/hifi/commerce/wallet/images/22.jpg
new file mode 100644
index 0000000000..66003db9c7
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/22.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/23.jpg b/interface/resources/qml/hifi/commerce/wallet/images/23.jpg
new file mode 100644
index 0000000000..72e02c6db0
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/23.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/24.jpg b/interface/resources/qml/hifi/commerce/wallet/images/24.jpg
new file mode 100644
index 0000000000..e481a587a5
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/24.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/25.jpg b/interface/resources/qml/hifi/commerce/wallet/images/25.jpg
new file mode 100644
index 0000000000..1300edf984
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/25.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/26.jpg b/interface/resources/qml/hifi/commerce/wallet/images/26.jpg
new file mode 100644
index 0000000000..9e3aaf9383
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/26.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/27.jpg b/interface/resources/qml/hifi/commerce/wallet/images/27.jpg
new file mode 100644
index 0000000000..f64c0c6a3d
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/27.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/28.jpg b/interface/resources/qml/hifi/commerce/wallet/images/28.jpg
new file mode 100644
index 0000000000..8f1580ab21
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/28.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/29.jpg b/interface/resources/qml/hifi/commerce/wallet/images/29.jpg
new file mode 100644
index 0000000000..fdfb4438ec
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/29.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/30.jpg b/interface/resources/qml/hifi/commerce/wallet/images/30.jpg
new file mode 100644
index 0000000000..785ea5a999
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/30.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/31.jpg b/interface/resources/qml/hifi/commerce/wallet/images/31.jpg
new file mode 100644
index 0000000000..06dc95afab
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/31.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/32.jpg b/interface/resources/qml/hifi/commerce/wallet/images/32.jpg
new file mode 100644
index 0000000000..b987c44e13
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/32.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/33.jpg b/interface/resources/qml/hifi/commerce/wallet/images/33.jpg
new file mode 100644
index 0000000000..19b05a5f73
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/33.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/34.jpg b/interface/resources/qml/hifi/commerce/wallet/images/34.jpg
new file mode 100644
index 0000000000..39f2a5f4ce
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/34.jpg differ