diff --git a/apps.json b/apps.json
index 83b671ada..a18795788 100644
--- a/apps.json
+++ b/apps.json
@@ -534,14 +534,14 @@
   },
   { "id": "qrcode",
     "name": "Custom QR Code",
-    "icon": "qrcode.png",
+    "icon": "app.png",
     "version":"0.01",
     "description": "Use this to upload a customised QR code to Bangle.js",
-    "tags": "",
-    "custom": "qrcode.html",
+    "tags": "qrcode",
+    "custom": "custom.html",
     "storage": [
       {"name":"qrcode.app.js"},
-      {"name":"qrcode.img"}
+      {"name":"qrcode.img","url":"app-icon.js","evaluate":true}
     ]
   },
   { "id": "beer",
diff --git a/apps/qrcode/app-icon.js b/apps/qrcode/app-icon.js
new file mode 100644
index 000000000..5905fa7e9
--- /dev/null
+++ b/apps/qrcode/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgP/AEX8gE8nkAn4FSngCWF6xfYDgIABHAQFPDQXD4YgDApxNDMooFOAQIdDAqIvWfcYA="))
diff --git a/apps/qrcode/qrcode.png b/apps/qrcode/app.png
similarity index 100%
rename from apps/qrcode/qrcode.png
rename to apps/qrcode/app.png
diff --git a/apps/qrcode/qrcode.html b/apps/qrcode/custom.html
similarity index 89%
rename from apps/qrcode/qrcode.html
rename to apps/qrcode/custom.html
index 5d372aa59..092b9ad18 100644
--- a/apps/qrcode/qrcode.html
+++ b/apps/qrcode/custom.html
@@ -41,11 +41,9 @@ g.setColor(0,0,0);
 g.drawString(url,120,230);
 g.setColor(1,1,1);
 `;
-        var icon = `require("heatshrink").decompress(atob("mEwgP/AEX8gE8nkAn4FSngCWF6xfYDgIABHAQFPDQXD4YgDApxNDMooFOAQIdDAqIvWfcYA="))`;
         sendCustomizedApp({
           storage:[
             {name:"qrcode.app.js", content:app},
-            {name:"qrcode.img", content:icon, evaluate:true},
           ]
         });