diff --git a/assets/lock.png b/assets/lock.png
index 4c5dadea38..e2df8e611e 100644
Binary files a/assets/lock.png and b/assets/lock.png differ
diff --git a/src/apps/common/request_pin.py b/src/apps/common/request_pin.py
index 9a03c2fa79..e65617a045 100644
--- a/src/apps/common/request_pin.py
+++ b/src/apps/common/request_pin.py
@@ -16,8 +16,10 @@ async def request_pin(code: int = None) -> str:
     def onchange():
         c = dialog.cancel
         if matrix.pin:
-            c.content = res.load(ui.ICON_CLEAR)
+            c.normal_style = ui.BTN_CLEAR['normal']
+            c.content = res.load(ui.ICON_BACK)
         else:
+            c.normal_style = ui.BTN_CANCEL['normal']
             c.content = res.load(ui.ICON_LOCK)
         c.taint()
         c.render()
diff --git a/src/trezor/res/lock.toig b/src/trezor/res/lock.toig
index 778e7ad69a..b258b16452 100644
Binary files a/src/trezor/res/lock.toig and b/src/trezor/res/lock.toig differ
diff --git a/src/trezor/ui/pin.py b/src/trezor/ui/pin.py
index c3e7c4cc03..c5a1e5ed34 100644
--- a/src/trezor/ui/pin.py
+++ b/src/trezor/ui/pin.py
@@ -67,5 +67,10 @@ class PinMatrix(ui.Widget):
 
     def change(self, pin):
         self.pin = pin
+        for btn in self.pin_buttons:
+            if len(self.pin) == self.maxlength:
+                btn.disable()
+            else:
+                btn.enable()
         if self.onchange:
             self.onchange()