diff --git a/apps/widlock/ChangeLog b/apps/widlock/ChangeLog
index bb84c2d44..665750150 100644
--- a/apps/widlock/ChangeLog
+++ b/apps/widlock/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Set sortorder to -1 so that widget always takes up the furthest left position
 0.05: Set sortorder to -10 so that others can take -1 etc
 0.06: Set sortorder to -10 in widget code
+0.07: Remove check for .isLocked (extremely old firmwares), speed up widget loading
diff --git a/apps/widlock/metadata.json b/apps/widlock/metadata.json
index 8635a5434..db532851a 100644
--- a/apps/widlock/metadata.json
+++ b/apps/widlock/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widlock",
   "name": "Lock Widget",
-  "version": "0.06",
+  "version": "0.07",
   "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/widlock/widget.js b/apps/widlock/widget.js
index 592361cd9..abcedde20 100644
--- a/apps/widlock/widget.js
+++ b/apps/widlock/widget.js
@@ -1,11 +1,8 @@
-(function(){
-  if (!Bangle.isLocked) return; // bail out on old firmware
-  Bangle.on("lock", function(on) {
-    WIDGETS["lock"].width = Bangle.isLocked()?16:0;
-    Bangle.drawWidgets();
-  });
-  WIDGETS["lock"]={area:"tl",sortorder:10,width:Bangle.isLocked()?16:0,draw:function(w) {
-    if (Bangle.isLocked())
-      g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
-  }};
-})()
+Bangle.on("lock", function() {
+  WIDGETS["lock"].width = Bangle.isLocked()?16:0;
+  Bangle.drawWidgets();
+});
+WIDGETS["lock"]={area:"tl",sortorder:10,width:Bangle.isLocked()?16:0,draw:function(w) {
+  if (Bangle.isLocked())
+    g.reset().drawImage(atob("DhABH+D/wwMMDDAwwMf/v//4f+H/h/8//P/z///f/g=="), w.x+1, w.y+4);
+}};
diff --git a/apps/widlockunlock/ChangeLog b/apps/widlockunlock/ChangeLog
new file mode 100644
index 000000000..b4d1ae593
--- /dev/null
+++ b/apps/widlockunlock/ChangeLog
@@ -0,0 +1 @@
+0.01: First commit
diff --git a/apps/widlockunlock/metadata.json b/apps/widlockunlock/metadata.json
new file mode 100644
index 000000000..d701279b9
--- /dev/null
+++ b/apps/widlockunlock/metadata.json
@@ -0,0 +1,13 @@
+{
+  "id": "widlockunlock",
+  "name": "Lock/Unlock Widget",
+  "version": "0.01",
+  "description": "On devices with always-on display (Bangle.js 2) this displays lock icon whenever the display is locked, or an unlock icon otherwise",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget,lock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"widlockunlock.wid.js","url":"widget.js"}
+  ]
+}
diff --git a/apps/widlockunlock/widget.js b/apps/widlockunlock/widget.js
new file mode 100644
index 000000000..0716a9edf
--- /dev/null
+++ b/apps/widlockunlock/widget.js
@@ -0,0 +1,6 @@
+Bangle.on("lockunlock", function() {
+  Bangle.drawWidgets();
+});
+WIDGETS["lockunlock"]={area:"tl",sortorder:10,width:14,draw:function(w) {
+  g.reset().drawImage(atob(Bangle.isLocked() ? "DBGBAAAA8DnDDCBCBP////////n/n/n//////z/A" : "DBGBAAAA8BnDDCBABP///8A8A8Y8Y8Y8A8A//z/A"), w.x+1, w.y+3);
+}};
diff --git a/apps/widlockunlock/widget.png b/apps/widlockunlock/widget.png
new file mode 100644
index 000000000..3a6b98161
Binary files /dev/null and b/apps/widlockunlock/widget.png differ