diff --git a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Contents.json b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Contents.json
index d4712fc..ece217c 100644
--- a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Contents.json
+++ b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Contents.json
@@ -2,15 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Icon-72.png",
+      "filename" : "Icon-57.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "Icon-60@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "Icon-60@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-57.png b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-57.png
new file mode 100644
index 0000000..9c1dee1
Binary files /dev/null and b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-57.png differ
diff --git a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-60@2x.png b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-60@2x.png
new file mode 100644
index 0000000..9e2b45c
Binary files /dev/null and b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-60@2x.png differ
diff --git a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-60@3x.png b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-60@3x.png
new file mode 100644
index 0000000..6b389ad
Binary files /dev/null and b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-60@3x.png differ
diff --git a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-72.png b/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-72.png
deleted file mode 100644
index de42014..0000000
Binary files a/passKit/Assets.xcassets/PasscodeLockViewIcon.imageset/Icon-72.png and /dev/null differ
diff --git a/passKit/Controllers/PasscodeLockViewController.swift b/passKit/Controllers/PasscodeLockViewController.swift
index 163c108..c962ad6 100644
--- a/passKit/Controllers/PasscodeLockViewController.swift
+++ b/passKit/Controllers/PasscodeLockViewController.swift
@@ -29,7 +29,7 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate {
     open override func loadView() {
         super.loadView()
 
-        let passcodeTextField =  UITextField(frame: CGRect(x: 0, y: 0, width: 300, height: 40))
+        let passcodeTextField =  UITextField()
         passcodeTextField.borderStyle = UITextField.BorderStyle.roundedRect
         passcodeTextField.placeholder = "EnterPasscode".localize()
         passcodeTextField.isSecureTextEntry = true
@@ -68,12 +68,14 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate {
                     }
                 }
                 biometryAuthButton.setTitle(biometryType, for: .normal)
+                biometryAuthButton.titleLabel?.font = UIFont.systemFont(ofSize: UIFont.systemFontSize)
                 biometryAuthButton.isHidden = false
             }
         }
         
         let forgotPasscodeButton = UIButton(type: .custom)
         forgotPasscodeButton.setTitle("ForgotYourPasscode?".localize(), for: .normal)
+        forgotPasscodeButton.titleLabel?.font = UIFont.systemFont(ofSize: UIFont.systemFontSize)
         forgotPasscodeButton.setTitleColor(Globals.blue, for: .normal)
         forgotPasscodeButton.addTarget(self, action: #selector(forgotPasscodeButtonPressedAction(_:)), for: .touchUpInside)
         // hide the forgotPasscodeButton if the native app is running
@@ -129,6 +131,10 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate {
             forgotPasscodeButton.bottomAnchor.constraint(equalTo: self.view.safeBottomAnchor, constant: -40)
         ])
 
+        // dismiss keyboard when tapping anywhere
+        let tap = UITapGestureRecognizer(target: self.view, action: #selector(UIView.endEditing))
+        view.addGestureRecognizer(tap)
+
     }
 
     open override func viewDidLoad() {