diff --git a/MoppApp/MoppApp.xcodeproj/project.pbxproj b/MoppApp/MoppApp.xcodeproj/project.pbxproj
index 71a8a45a2..26ed1b0e0 100644
--- a/MoppApp/MoppApp.xcodeproj/project.pbxproj
+++ b/MoppApp/MoppApp.xcodeproj/project.pbxproj
@@ -30,6 +30,9 @@
 		4E59080024B0F914001B23A6 /* SmartIDEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E5907FF24B0F914001B23A6 /* SmartIDEditViewController.swift */; };
 		4E59080224B258C7001B23A6 /* SmartIDChallengeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E59080124B258C6001B23A6 /* SmartIDChallengeViewController.swift */; };
 		4E59080424B2E295001B23A6 /* SmartIDSignature.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E59080324B2E295001B23A6 /* SmartIDSignature.swift */; };
+		4E6E1D9B2AAB493A008B3E74 /* NFCEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6E1D9A2AAB493A008B3E74 /* NFCEditViewController.swift */; };
+		4EE56D232AB0561C002648EE /* NFCSignature.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EE56D222AB0561C002648EE /* NFCSignature.swift */; };
+		4EE56D272AB058A6002648EE /* SwiftECC in Frameworks */ = {isa = PBXBuildFile; productRef = 4EE56D262AB058A6002648EE /* SwiftECC */; };
 		540786E91E1A76640016ABA7 /* UITextView+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540786E81E1A76640016ABA7 /* UITextView+Additions.swift */; };
 		547BDF251E8BEFA30093931F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E4250D0D1E0AA8E500530370 /* Localizable.strings */; };
 		54825EF51E1CFE9600253FF0 /* Date+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54825EF41E1CFE9600253FF0 /* Date+Additions.swift */; };
@@ -370,6 +373,8 @@
 		4E5907FF24B0F914001B23A6 /* SmartIDEditViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartIDEditViewController.swift; sourceTree = "<group>"; };
 		4E59080124B258C6001B23A6 /* SmartIDChallengeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartIDChallengeViewController.swift; sourceTree = "<group>"; };
 		4E59080324B2E295001B23A6 /* SmartIDSignature.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmartIDSignature.swift; sourceTree = "<group>"; };
+		4E6E1D9A2AAB493A008B3E74 /* NFCEditViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NFCEditViewController.swift; sourceTree = "<group>"; };
+		4EE56D222AB0561C002648EE /* NFCSignature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFCSignature.swift; sourceTree = "<group>"; };
 		540786E81E1A76640016ABA7 /* UITextView+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextView+Additions.swift"; sourceTree = "<group>"; };
 		54825EF41E1CFE9600253FF0 /* Date+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Date+Additions.swift"; sourceTree = "<group>"; };
 		54825EF71E1D270F00253FF0 /* String+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Additions.swift"; sourceTree = "<group>"; };
@@ -644,6 +649,7 @@
 				393B66E820DB9C19001DC89B /* CryptoLib.framework in Frameworks */,
 				DF135630290201A100F61823 /* ExternalAccessory.framework in Frameworks */,
 				DF1503AB2AC5D1E5007222B2 /* ZIPFoundation in Frameworks */,
+				4EE56D272AB058A6002648EE /* SwiftECC in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -677,6 +683,7 @@
 				C54EA6E72045A9E30039AC78 /* IdCardViewController.swift */,
 				C54BB10E1FBD93A100A274F6 /* MobileIDChallengeViewController.swift */,
 				C537AE532004C29E009037E5 /* MobileIDEditViewController.swift */,
+				4E6E1D9A2AAB493A008B3E74 /* NFCEditViewController.swift */,
 				4E59080124B258C6001B23A6 /* SmartIDChallengeViewController.swift */,
 				4E5907FF24B0F914001B23A6 /* SmartIDEditViewController.swift */,
 				C50DCD1A1FD1576B00D48E16 /* SigningTableViewHeaderView.swift */,
@@ -734,8 +741,7 @@
 			children = (
 				C50DCCD01FC573FB00D48E16 /* Roboto */,
 			);
-			name = Fonts;
-			path = "New Group";
+			path = Fonts;
 			sourceTree = "<group>";
 		};
 		C50DCCD01FC573FB00D48E16 /* Roboto */ = {
@@ -1202,6 +1208,7 @@
 				DFDF02C3241ED0CA006CF443 /* MobileIDSignature.swift */,
 				4E59080324B2E295001B23A6 /* SmartIDSignature.swift */,
 				DFBDF20127DF7ED700A5CF3C /* IDCardSignature.swift */,
+				4EE56D222AB0561C002648EE /* NFCSignature.swift */,
 				DFDF02BD241EB5D3006CF443 /* SessionCertificate.swift */,
 				E4C53F4D1E30D13100F209BE /* Session.swift */,
 				DFDF02BF241EC72C006CF443 /* SessionStatus.swift */,
@@ -1296,6 +1303,7 @@
 				DF1503A52AC5D1B9007222B2 /* FirebaseCrashlytics */,
 				DF1503A72AC5D1DB007222B2 /* SwiftyRSA */,
 				DF1503AA2AC5D1E5007222B2 /* ZIPFoundation */,
+				4EE56D262AB058A6002648EE /* SwiftECC */,
 			);
 			productName = MoppApp;
 			productReference = E4250CC31E0968D200530370 /* MoppApp.app */;
@@ -1348,6 +1356,7 @@
 				DF15037C2AC5CD32007222B2 /* XCRemoteSwiftPackageReference "SwiftyRSA" */,
 				DF15037F2AC5CD8D007222B2 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
 				DF1503822AC5CDBC007222B2 /* XCRemoteSwiftPackageReference "ASN1Decoder" */,
+				4EE56D252AB058A6002648EE /* XCRemoteSwiftPackageReference "SwiftECC" */,
 			);
 			productRefGroup = E4250CC41E0968D200530370 /* Products */;
 			projectDirPath = "";
@@ -1607,6 +1616,7 @@
 				C50DCD461FDECE2B00D48E16 /* SignatureDetailsViewController.swift in Sources */,
 				DF5BE6D429C8BD5600331609 /* WarningDetail.swift in Sources */,
 				DF32A6812909F0FA00AE5F82 /* FileLogUtil.swift in Sources */,
+				4EE56D232AB0561C002648EE /* NFCSignature.swift in Sources */,
 				C50DCCFF1FC6E95A00D48E16 /* ContainerViewController.swift in Sources */,
 				C50DCD481FDED76400D48E16 /* SignatureDetailsCell.swift in Sources */,
 				DF0C2B3F29150EAB007E1745 /* ScaledLabel.swift in Sources */,
@@ -1680,6 +1690,7 @@
 				C506EC811FB9F4AF00E07226 /* UIImage+Additions.swift in Sources */,
 				C55A6E42208766BA000F3386 /* MyeIDChangeCodesLoadingViewController.swift in Sources */,
 				DFDC0ABA29FAD8F2002D1D1D /* ViewUtil.swift in Sources */,
+				4E6E1D9B2AAB493A008B3E74 /* NFCEditViewController.swift in Sources */,
 				DFD8BEF5291C432400FE8F07 /* ScaledButton.swift in Sources */,
 				C5927FC720751402003B7F41 /* MyeIDPinPukCell.swift in Sources */,
 				DFF3C3AF233231190079458A /* SettingsConfiguration.swift in Sources */,
@@ -2125,6 +2136,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		4EE56D252AB058A6002648EE /* XCRemoteSwiftPackageReference "SwiftECC" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/leif-ibsen/SwiftECC";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 4.0.0;
+			};
+		};
 		DF1503792AC5CCE7007222B2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
@@ -2160,6 +2179,11 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		4EE56D262AB058A6002648EE /* SwiftECC */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4EE56D252AB058A6002648EE /* XCRemoteSwiftPackageReference "SwiftECC" */;
+			productName = SwiftECC;
+		};
 		DF1503A32AC5D163007222B2 /* ASN1Decoder */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = DF1503822AC5CDBC007222B2 /* XCRemoteSwiftPackageReference "ASN1Decoder" */;
diff --git a/MoppApp/MoppApp/AlertUtil.swift b/MoppApp/MoppApp/AlertUtil.swift
index 9457a3f26..b29fad54d 100644
--- a/MoppApp/MoppApp/AlertUtil.swift
+++ b/MoppApp/MoppApp/AlertUtil.swift
@@ -63,6 +63,8 @@ class AlertUtil {
             case .cancelled:
                 topViewController.dismiss(animated: true)
                 return
+            case .nfcCancelled:
+                return
             default:
                 break
             }
@@ -71,6 +73,8 @@ class AlertUtil {
             case .cancelled:
                 topViewController.dismiss(animated: true)
                 return
+            case .nfcCancelled:
+                return
             default:
                 break
             }
diff --git a/MoppApp/MoppApp/CancelUtil.swift b/MoppApp/MoppApp/CancelUtil.swift
index 9d35acbf5..a3c8592b9 100644
--- a/MoppApp/MoppApp/CancelUtil.swift
+++ b/MoppApp/MoppApp/CancelUtil.swift
@@ -28,6 +28,6 @@ class CancelUtil {
     
     static func handleCancelledRequest(errorMessageDetails: String) {
         CancelRequestUtil.handleRequestCancellation()
-        ErrorUtil.generateError(signingError: .cancelled, details: MessageUtil.errorMessageWithDetails(details: errorMessageDetails))
+        ErrorUtil.generateError(signingError: .nfcCancelled, details: MessageUtil.errorMessageWithDetails(details: errorMessageDetails))
     }
 }
diff --git a/MoppApp/MoppApp/Info.plist b/MoppApp/MoppApp/Info.plist
index 6521e28f8..1e8a35295 100644
--- a/MoppApp/MoppApp/Info.plist
+++ b/MoppApp/MoppApp/Info.plist
@@ -219,6 +219,8 @@
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
+	<key>NFCReaderUsageDescription</key>
+	<string>This app uses NFC to scan ID-cards</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>
@@ -1020,5 +1022,9 @@
 			</dict>
 		</dict>
 	</array>
+	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
+	<array>
+		<string>A000000077010800070000FE000001</string>
+	</array>
 </dict>
 </plist>
diff --git a/MoppApp/MoppApp/KeychainUtil.swift b/MoppApp/MoppApp/KeychainUtil.swift
index b8c86186c..2e9990799 100644
--- a/MoppApp/MoppApp/KeychainUtil.swift
+++ b/MoppApp/MoppApp/KeychainUtil.swift
@@ -28,52 +28,52 @@ class KeychainUtil {
     static func save(key: String, info: String) -> Bool {
         guard let bundleIdentifier = Bundle.main.bundleIdentifier else { return false }
         if let data = info.data(using: .utf8) {
-            let query: [String: Any] = [
-                kSecClass as String: kSecClassGenericPassword,
-                kSecAttrService as String: bundleIdentifier,
-                kSecAttrAccount as String: "\(bundleIdentifier).\(key)",
-                kSecValueData as String: data,
-                kSecAttrAccessible as String: kSecAttrAccessibleWhenUnlockedThisDeviceOnly
+            let query: [CFString: Any] = [
+                kSecClass: kSecClassGenericPassword,
+                kSecAttrService: bundleIdentifier,
+                kSecAttrAccount: "\(bundleIdentifier).\(key)",
+                kSecValueData: data,
+                kSecAttrAccessible: kSecAttrAccessibleWhenUnlockedThisDeviceOnly
             ]
             SecItemDelete(query as CFDictionary)
             let status = SecItemAdd(query as CFDictionary, nil)
-            
+
             return status == errSecSuccess
         }
         return false
     }
-    
+
     static func retrieve(key: String) -> String? {
         guard let bundleIdentifier = Bundle.main.bundleIdentifier else { return nil }
-        let query: [String: Any] = [
-            kSecClass as String: kSecClassGenericPassword,
-            kSecAttrService as String: bundleIdentifier,
-            kSecAttrAccount as String: "\(bundleIdentifier).\(key)",
-            kSecReturnData as String: true,
-            kSecMatchLimit as String: kSecMatchLimitOne,
-            kSecAttrAccessible as String: kSecAttrAccessibleWhenUnlockedThisDeviceOnly
+        let query: [CFString: Any] = [
+            kSecClass: kSecClassGenericPassword,
+            kSecAttrService: bundleIdentifier,
+            kSecAttrAccount: "\(bundleIdentifier).\(key)",
+            kSecReturnData: true,
+            kSecMatchLimit: kSecMatchLimitOne,
+            kSecAttrAccessible: kSecAttrAccessibleWhenUnlockedThisDeviceOnly
         ]
-        
+
         var infoData: AnyObject?
         let status = SecItemCopyMatching(query as CFDictionary, &infoData)
-        
+
         if status == errSecSuccess, let data = infoData as? Data {
             return String(data: data, encoding: .utf8)
         } else {
             return nil
         }
     }
-    
+
     static func remove(key: String) {
         guard let bundleIdentifier = Bundle.main.bundleIdentifier else { return }
-        let query: [String: Any] = [
-            kSecClass as String: kSecClassGenericPassword,
-            kSecAttrService as String: bundleIdentifier,
-            kSecAttrAccount as String: "\(bundleIdentifier).\(key)"
+        let query: [CFString: Any] = [
+            kSecClass: kSecClassGenericPassword,
+            kSecAttrService: bundleIdentifier,
+            kSecAttrAccount: "\(bundleIdentifier).\(key)"
         ]
-        
+
         let status = SecItemDelete(query as CFDictionary)
-        
+
         if status != errSecSuccess {
             printLog("Error removing key from Keychain: \(status)")
         }
diff --git a/MoppApp/MoppApp/LocalizationKeys.swift b/MoppApp/MoppApp/LocalizationKeys.swift
index 2f726f944..326475fee 100644
--- a/MoppApp/MoppApp/LocalizationKeys.swift
+++ b/MoppApp/MoppApp/LocalizationKeys.swift
@@ -166,6 +166,21 @@ enum LocKey : String
     case smartIdCountryLithuania = "smart-id-country-lithuania"
     case smartIdCountryLatvia = "smart-id-country-latvia"
     case smartIdChallengeTitle = "smart-id-challenge-title"
+    case nfcTitle = "nfc-title"
+    case nfcCANTitle = "nfc-can-title"
+    case nfcDeviceNoSupport = "nfc-device-no-support"
+    case nfcHoldNear = "nfc-hold-near"
+    case nfcMultipleCards = "nfc-multiple-cards"
+    case nfcInvalidTag = "nfc-invalid-tag"
+    case nfcUnableConnect = "nfc-unable-connect"
+    case nfcAuth = "nfc-auth"
+    case nfcReadingCert = "nfc-reading-cert"
+    case nfcSignDoc = "nfc-sign-doc"
+    case nfcSignDone = "nfc-sign-done"
+    case nfcAuthFailed = "nfc-auth-failed"
+    case nfcSignFailed = "nfc-sign-failed"
+    case nfcPinInvalid = "nfc-pin-invalid"
+    case nfcPinLocked = "nfc-pin-locked"
     case containerSignTitle = "container-sign-title"
     case containerEncryptionTitle = "container-encryption-title"
     case containerDecryptionTitle = "container-decryption-title"
@@ -190,6 +205,7 @@ enum LocKey : String
     case signTitleMobileId = "sign-title-mobile-id"
     case signTitleSmartId = "sign-title-smart-id"
     case signTitleIdCard = "sign-title-id-card"
+    case signTitleNFC = "sign-title-nfc"
     case cardReaderStateReaderNotFound = "card-reader-state-reader-not-found"
     case cardReaderStateReaderRestarted = "card-reader-state-reader-restarted"
     case cardReaderStateReaderProcessFailed = "card-reader-state-reader-process-failed"
diff --git a/MoppApp/MoppApp/MoppApp.entitlements b/MoppApp/MoppApp/MoppApp.entitlements
index 35496166c..a713e19e8 100644
--- a/MoppApp/MoppApp/MoppApp.entitlements
+++ b/MoppApp/MoppApp/MoppApp.entitlements
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.nfc.readersession.formats</key>
+	<array>
+		<string>TAG</string>
+	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.ee.ria.digidoc.ios</string>
diff --git a/MoppApp/MoppApp/MyEid.storyboard b/MoppApp/MoppApp/MyEid.storyboard
index 6574cc879..173185ebf 100644
--- a/MoppApp/MoppApp/MyEid.storyboard
+++ b/MoppApp/MoppApp/MyEid.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="qFP-og-5IC">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="qFP-og-5IC">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -72,11 +72,11 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" alignment="center" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="Qrp-ZX-mtd">
-                                <rect key="frame" x="16" y="25" width="343" height="617"/>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" spacing="48" translatesAutoresizingMaskIntoConstraints="NO" id="Qrp-ZX-mtd">
+                                <rect key="frame" x="25" y="333.5" width="325" height="0.0"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pwG-59-c68" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                        <rect key="frame" x="171.5" y="0.0" width="0.0" height="617"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pwG-59-c68" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="325" height="0.0"/>
                                         <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="20"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -87,10 +87,10 @@
                         <viewLayoutGuide key="safeArea" id="DqR-NQ-ADW"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="Qrp-ZX-mtd" secondAttribute="trailing" constant="16" id="ASj-5k-e8A"/>
-                            <constraint firstItem="Qrp-ZX-mtd" firstAttribute="leading" secondItem="9cX-nZ-t1m" secondAttribute="leading" constant="16" id="Elo-cB-Fxt"/>
-                            <constraint firstItem="Qrp-ZX-mtd" firstAttribute="top" secondItem="9cX-nZ-t1m" secondAttribute="top" constant="25" id="L9Y-2q-lHw"/>
-                            <constraint firstAttribute="bottom" secondItem="Qrp-ZX-mtd" secondAttribute="bottom" constant="25" id="MXc-vA-zNR"/>
+                            <constraint firstItem="Qrp-ZX-mtd" firstAttribute="leading" secondItem="DqR-NQ-ADW" secondAttribute="leading" constant="25" id="EDS-lq-bcD"/>
+                            <constraint firstItem="Qrp-ZX-mtd" firstAttribute="centerY" secondItem="9cX-nZ-t1m" secondAttribute="centerY" id="GvK-nZ-7kU"/>
+                            <constraint firstItem="Qrp-ZX-mtd" firstAttribute="centerX" secondItem="9cX-nZ-t1m" secondAttribute="centerX" id="KPP-yW-apv"/>
+                            <constraint firstItem="DqR-NQ-ADW" firstAttribute="trailing" secondItem="Qrp-ZX-mtd" secondAttribute="trailing" constant="25" id="Net-6N-O97"/>
                         </constraints>
                     </view>
                     <connections>
diff --git a/MoppApp/MoppApp/MyeIDStatusViewController.swift b/MoppApp/MoppApp/MyeIDStatusViewController.swift
index 1fa45d0b9..e4dfef8a5 100644
--- a/MoppApp/MoppApp/MyeIDStatusViewController.swift
+++ b/MoppApp/MoppApp/MyeIDStatusViewController.swift
@@ -40,9 +40,6 @@ class MyeIDStatusViewController : MoppViewController {
             spinnerView.show(true)
             spinnerView.translatesAutoresizingMaskIntoConstraints = false
             statusStackView.addArrangedSubview(spinnerView)
-            NSLayoutConstraint.activate([
-                spinnerView.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 16)
-            ])
             loadingView = spinnerView
         }
     }
diff --git a/MoppApp/MoppApp/NFCEditViewController.swift b/MoppApp/MoppApp/NFCEditViewController.swift
new file mode 100644
index 000000000..5321418af
--- /dev/null
+++ b/MoppApp/MoppApp/NFCEditViewController.swift
@@ -0,0 +1,236 @@
+//
+//  NFCEditViewController.swift
+//  MoppApp
+//
+/*
+ * Copyright 2017 - 2024 Riigi Infosüsteemi Amet
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+import UIKit
+import CoreNFC
+
+protocol NFCEditViewControllerDelegate : AnyObject {
+    func nfcEditViewControllerDidDismiss(cancelled: Bool, can: String?, pin: String?)
+}
+
+class NFCEditViewController : MoppViewController, TokenFlowSigning {
+    @IBOutlet weak var scrollView: UIScrollView!
+    @IBOutlet weak var canTextField: UITextField!
+    @IBOutlet weak var pinTextField: UITextField!
+    @IBOutlet weak var titleLabel: UILabel!
+    @IBOutlet weak var canTextLabel: UILabel!
+    @IBOutlet weak var pinTextLabel: UILabel!
+    @IBOutlet weak var canTextErrorLabel: UILabel!
+    @IBOutlet weak var pinTextErrorLabel: UILabel!
+    @IBOutlet weak var cancelButton: MoppButton!
+    @IBOutlet weak var signButton: MoppButton!
+    
+    static private let nfcCANKey = "nfcCANKey"
+    weak var delegate: NFCEditViewControllerDelegate? = nil
+    var tapGR: UITapGestureRecognizer!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        let notAvailable = !NFCTagReaderSession.readingAvailable
+
+        titleLabel.text = notAvailable ? L(.nfcDeviceNoSupport) : L(.nfcTitle)
+        canTextLabel.text = L(.nfcCANTitle)
+        canTextLabel.isHidden = notAvailable
+        pinTextLabel.text = L(.pin2TextfieldLabel)
+        pinTextLabel.isHidden = notAvailable
+
+        canTextErrorLabel.text = ""
+        canTextErrorLabel.isHidden = true
+        pinTextErrorLabel.text = ""
+        pinTextErrorLabel.isHidden = true
+        
+        canTextLabel.textColor = UIColor.moppText
+        pinTextLabel.textColor = UIColor.moppText
+
+        canTextField.moppPresentDismissButton()
+        canTextField.layer.borderColor = UIColor.moppContentLine.cgColor
+        canTextField.layer.borderWidth = 1.0
+        canTextField.delegate = self
+        canTextField.isHidden = notAvailable
+        pinTextField.moppPresentDismissButton()
+        pinTextField.layer.borderColor = UIColor.moppContentLine.cgColor
+        pinTextField.layer.borderWidth = 1.0
+        pinTextField.delegate = self
+        pinTextField.isHidden = notAvailable
+
+        cancelButton.setTitle(L(.actionCancel).uppercased())
+        cancelButton.adjustedFont()
+        signButton.setTitle(L(.actionSign).uppercased())
+        signButton.adjustedFont()
+
+        tapGR = UITapGestureRecognizer()
+        tapGR.addTarget(self, action: #selector(cancelAction))
+        view.addGestureRecognizer(tapGR)
+    }
+
+    @objc func dismissKeyboard(_ notification: NSNotification) {
+        pinTextField.resignFirstResponder()
+        canTextField.resignFirstResponder()
+    }
+
+    @IBAction func cancelAction() {
+        dismiss(animated: false) {
+            [weak self] in
+            guard let sself = self else { return }
+            sself.delegate?.nfcEditViewControllerDidDismiss(
+                cancelled: true,
+                can: nil,
+                pin: nil)
+            UIAccessibility.post(notification: .screenChanged, argument: L(.signingCancelled))
+        }
+    }
+
+    @IBAction func signAction() {
+        if DefaultsHelper.isRoleAndAddressEnabled {
+            let roleAndAddressView = UIStoryboard.tokenFlow.instantiateViewController(of: RoleAndAddressViewController.self)
+            roleAndAddressView.modalPresentationStyle = .overCurrentContext
+            roleAndAddressView.modalTransitionStyle = .crossDissolve
+            roleAndAddressView.viewController = self
+            present(roleAndAddressView, animated: true)
+        } else {
+            sign(nil)
+        }
+    }
+
+    func sign(_ pin: String?) {
+        dismiss(animated: false) {
+            [weak self] in
+            guard let sself = self else { return }
+            sself.delegate?.nfcEditViewControllerDidDismiss(
+                cancelled: false,
+                can: sself.canTextField.text,
+                pin: sself.pinTextField.text)
+        }
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        canTextField.text = KeychainUtil.retrieve(key: NFCEditViewController.nfcCANKey)
+        pinTextField.text = ""
+
+        canTextField.attributedPlaceholder = NSAttributedString(string: "CAN", attributes: [NSAttributedString.Key.foregroundColor: UIColor.moppPlaceholderDarker])
+        pinTextField.attributedPlaceholder = NSAttributedString(string: "PIN2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.moppPlaceholderDarker])
+
+        canTextField.addTarget(self, action: #selector(editingChanged(sender:)), for: .editingChanged)
+        pinTextField.addTarget(self, action: #selector(editingChanged(sender:)), for: .editingChanged)
+
+        canTextField.accessibilityLabel = L(.nfcCANTitle)
+        pinTextField.accessibilityLabel = L(.pin2TextfieldLabel)
+
+        verifySigningCapability()
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        self.view.backgroundColor = UIColor.black.withAlphaComponent(0.0)
+    }
+
+    deinit {
+        canTextField.removeTarget(self, action: #selector(editingChanged(sender:)), for: .editingChanged)
+        pinTextField.removeTarget(self, action: #selector(editingChanged(sender:)), for: .editingChanged)
+    }
+
+    @objc func handleAccessibilityKeyboard(_ notification: NSNotification) {
+        dismissKeyboard(notification)
+        ViewUtil.focusOnView(notification, mainView: self.view, scrollView: scrollView)
+    }
+
+    func verifySigningCapability() {
+        if canTextField.text?.count == 6,
+           pinTextField.text?.count ?? 0 >= 5,
+           pinTextField.text?.count ?? 0 <= 12 {
+            signButton.isEnabled = true
+            signButton.backgroundColor = UIColor.moppBase
+        } else {
+            signButton.isEnabled = false
+            signButton.backgroundColor = UIColor.moppLabel
+        }
+    }
+
+    @objc func editingChanged(sender: UITextField) {
+        verifySigningCapability()
+    }
+
+    override func keyboardWillShow(notification: NSNotification) {
+        if canTextField.isFirstResponder {
+            showKeyboard(textFieldLabel: canTextLabel, scrollView: scrollView)
+        }
+
+        if pinTextField.isFirstResponder {
+            showKeyboard(textFieldLabel: pinTextLabel, scrollView: scrollView)
+        }
+    }
+
+    override func keyboardWillHide(notification: NSNotification) {
+        hideKeyboard(scrollView: scrollView)
+    }
+}
+
+extension NFCEditViewController : UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        guard textField.accessibilityIdentifier == "nfcCanField" else {
+            textField.resignFirstResponder()
+            return true
+        }
+        textField.resignFirstResponder()
+        if let pinTextField = getViewByAccessibilityIdentifier(view: view, identifier: "nfcPinField") {
+            pinTextField.becomeFirstResponder()
+        }
+        return true
+    }
+
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if let text = textField.text as NSString? {
+            let textAfterUpdate = text.replacingCharacters(in: range, with: string)
+            return textAfterUpdate.isNumeric || textAfterUpdate.isEmpty
+        }
+        return true
+    }
+
+    func textFieldDidBeginEditing(_ textField: UITextField) {
+        textField.moveCursorToEnd()
+    }
+
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textField.accessibilityIdentifier == "nfcCanField" {
+            if let can = textField.text {
+                _ = KeychainUtil.save(key: NFCEditViewController.nfcCANKey, info: can)
+            } else {
+                KeychainUtil.remove(key: NFCEditViewController.nfcCANKey)
+                canTextErrorLabel.text = ""
+                canTextErrorLabel.isHidden = true
+                removeViewBorder(view: textField)
+                UIAccessibility.post(notification: .layoutChanged, argument: canTextField)
+            }
+        }
+        if textField.accessibilityIdentifier == "nfcPinField",
+           textField.text != nil {
+            pinTextErrorLabel.text = ""
+            pinTextErrorLabel.isHidden = true
+            removeViewBorder(view: textField)
+            UIAccessibility.post(notification: .screenChanged, argument: pinTextField)
+        }
+    }
+}
diff --git a/MoppApp/MoppApp/NFCSignature.swift b/MoppApp/MoppApp/NFCSignature.swift
new file mode 100644
index 000000000..b54c23ada
--- /dev/null
+++ b/MoppApp/MoppApp/NFCSignature.swift
@@ -0,0 +1,579 @@
+/*
+ * MoppApp - NFCSignature.swift
+ * Copyright 2017 - 2024 Riigi Infosüsteemi Amet
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+import Foundation
+import CoreNFC
+import CommonCrypto
+import CryptoTokenKit
+import SwiftECC
+import BigInt
+import SkSigningLib
+
+struct RuntimeError: Error {
+    let msg: String
+}
+
+struct PinError: Error {
+    let attemptsLeft: UInt8
+}
+
+class NFCSignature : NSObject, NFCTagReaderSessionDelegate {
+
+    static let shared: NFCSignature = NFCSignature()
+    var session: NFCTagReaderSession?
+    var CAN: String?
+    var PIN: String?
+    var containerPath: String?
+    var roleData: MoppLibRoleAddressData?
+    var ksEnc: Bytes?
+    var ksMac: Bytes?
+    var SSC: Bytes?
+
+    func createNFCSignature(can: String, pin: String, containerPath: String, hashType: String, roleData: MoppLibRoleAddressData?) -> Void {
+        guard NFCTagReaderSession.readingAvailable else {
+            return CancelUtil.handleCancelledRequest(errorMessageDetails: L(.nfcDeviceNoSupport))
+        }
+
+        CAN = can
+        PIN = pin
+        self.containerPath = containerPath
+        session = NFCTagReaderSession(pollingOption: .iso14443, delegate: self)
+        session?.alertMessage = L(.nfcHoldNear)
+        session?.begin()
+
+        if UIAccessibility.isVoiceOverRunning {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                UIAccessibility.post(notification: .announcement, argument: self.session?.alertMessage)
+            }
+        }
+    }
+
+    // MARK: - NFCTagReaderSessionDelegate
+
+    func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) {
+        @Sendable func setSessionMessage(_ msg: String, invalidate: Bool = false) -> Void {
+            if invalidate {
+                session.invalidate(errorMessage: msg)
+            } else {
+                session.alertMessage = msg
+            }
+            if UIAccessibility.isVoiceOverRunning {
+                UIAccessibility.post(notification: .announcement, argument: msg)
+            }
+        }
+        if tags.count > 1 {
+            let retryInterval = DispatchTimeInterval.milliseconds(500)
+            setSessionMessage(L(.nfcMultipleCards))
+            return DispatchQueue.global().asyncAfter(deadline: .now() + retryInterval) {
+                session.restartPolling()
+            }
+        }
+
+        guard case let .iso7816(tag) = tags.first else {
+            return setSessionMessage(L(.nfcInvalidTag), invalidate: true)
+        }
+
+        Task {
+            do {
+                try await session.connect(to: tags.first!)
+            } catch {
+                return setSessionMessage(L(.nfcUnableConnect), invalidate: true)
+            }
+            do {
+                setSessionMessage(L(.nfcAuth))
+                guard let (ksEnc, ksMac) = try await mutualAuthenticate(tag: tag) else {
+                    return setSessionMessage(L(.nfcAuthFailed), invalidate: true)
+                }
+                printLog("Mutual authentication successful")
+                self.ksEnc = ksEnc
+                self.ksMac = ksMac
+                self.SSC = AES.Zero
+                setSessionMessage(L(.nfcReadingCert))
+                try await selectDF(tag: tag, file: Data())
+                try await selectDF(tag: tag, file: Data([0xAD, 0xF2]))
+                let cert = try await readEF(tag: tag, file: Data([0x34, 0x1F]))
+                printLog("Cert reading done")
+                guard let hash = MoppLibManager.prepareSignature(cert.base64EncodedString(), containerPath: containerPath, roleData: roleData) else {
+                    return setSessionMessage(L(.nfcSignFailed), invalidate: true)
+                }
+                setSessionMessage(L(.nfcSignDoc))
+                var pin = Data(repeating: 0xFF, count: 12)
+                pin.replaceSubrange(0..<PIN!.count, with: PIN!.utf8)
+                _ = try await sendWrapped(tag: tag, cls: 0x00, ins: 0x22, p1: 0x41, p2: 0xb6, data: Data(hex: "80015484019f")!)
+                _ = try await sendWrapped(tag: tag, cls: 0x00, ins: 0x20, p1: 0x00, p2: 0x85, data: pin)
+                let signatureValue = try await sendWrapped(tag: tag, cls:0x00, ins: 0x2A, p1: 0x9E, p2: 0x9A, data: Data(base64Encoded: hash)!, le: 256);
+                setSessionMessage(L(.nfcSignDone))
+                session.invalidate()
+                printLog("\nRIA.NFC - Validating signature...\n")
+                MoppLibManager.isSignatureValid(cert.base64EncodedString(), signatureValue: signatureValue.base64EncodedString(), success: { _ in
+                    printLog("\nRIA.NFC - Successfully validated signature!\n")
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                        NotificationCenter.default.post(
+                            name: .signatureCreatedFinishedNotificationName,
+                            object: nil,
+                            userInfo: nil)
+                    }
+                }, failure: { (error: Error?) in
+                    printLog("\nRIA.NFC - Error validating signature. Error: \(error?.localizedDescription ?? "Unable to display error")\n")
+                    guard let err = error as NSError? else {
+                        return ErrorUtil.generateError(signingError: .generalSignatureAddingError, details: MessageUtil.errorMessageWithDetails(details: "Unknown error"))
+                    }
+                    let details = MessageUtil.generateDetailedErrorMessage(error: err) ?? err.domain
+                    switch err.code {
+                    case 5, 6:
+                        printLog("\nRIA.NFC - Certificate revoked. \(err.domain)")
+                        ErrorUtil.generateError(signingError: .certificateRevoked, details: details)
+                    case 7:
+                        printLog("\nRIA.NFC - Invalid OCSP time slot. \(err.domain)")
+                        ErrorUtil.generateError(signingError: .ocspInvalidTimeSlot, details: details)
+                    case 18:
+                        printLog("\nRIA.NFC - Too many requests. \(err.domain)")
+                        ErrorUtil.generateError(signingError: .tooManyRequests(signingMethod: SigningType.nfc.rawValue), details: details)
+                    default:
+                        printLog("\nRIA.NFC - General signature adding error. \(err.domain)")
+                        ErrorUtil.generateError(signingError: .empty, details: details)
+                    }
+                })
+            } catch let error as PinError {
+                printLog("\nRIA.NFC - PinError count \(error.attemptsLeft)")
+                switch error.attemptsLeft {
+                case 0: setSessionMessage(L(.pin2BlockedAlert), invalidate: true)
+                case 1: setSessionMessage(L(.wrongPin2Single), invalidate: true)
+                default: setSessionMessage(L(.wrongPin2, [error.attemptsLeft]), invalidate: true)
+                }
+            } catch let error as RuntimeError {
+                printLog("\nRIA.NFC - RuntimeError \(error.msg)")
+                setSessionMessage(L(.nfcSignFailed), invalidate: true)
+            } catch {
+                printLog("\nRIA.NFC - Error \(error.localizedDescription)")
+                setSessionMessage(L(.nfcSignFailed), invalidate: true)
+            }
+        }
+    }
+
+    func tagReaderSessionDidBecomeActive(_ session: NFCTagReaderSession) {
+    }
+
+    func tagReaderSession(_ session: NFCTagReaderSession, didInvalidateWithError error: Error) {
+        if let readerError = error as? NFCReaderError,
+           readerError.code == .readerSessionInvalidationErrorUserCanceled {
+            CancelUtil.handleCancelledRequest(errorMessageDetails: "User cancelled NFC signing")
+        } else {
+            CancelUtil.handleCancelledRequest(errorMessageDetails: "Session Invalidated")
+        }
+        self.session = nil
+    }
+
+    // MARK: - PACE
+    func mutualAuthenticate(tag: NFCISO7816Tag) async throws -> (Bytes, Bytes)? {
+        let oid = "04007f00070202040204" // id-PACE-ECDH-GM-AES-CBC-CMAC-256
+        // + CAN
+        _ = try await tag.sendCommand(cls: 0x00, ins: 0x22, p1: 0xc1, p2: 0xa4, data: Data(hex: "800a\(oid)830102")!)
+        let nonceTag = try await tag.sendPaceCommand(records: [], tagExpected: 0x80)
+        printLog("Challenge \(nonceTag.data.toHex)")
+        let nonce = try decryptNonce(encryptedNonce: nonceTag.value)
+        printLog("Nonce \(nonce.toHex)")
+        let domain = Domain.instance(curve: .EC256r1)
+
+        // Mapping data
+        let (terminalPubKey, terminalPrivKey) = domain.makeKeyPair()
+        let mappingTag = try await tag.sendPaceCommand(records: [try TKBERTLVRecord(tag: 0x81, publicKey: terminalPubKey)], tagExpected: 0x82)
+        printLog("Mapping key \(mappingTag.data.toHex)")
+        let cardPubKey = try ECPublicKey(domain: domain, tlv: mappingTag)!
+
+        // Mapping
+        let nonceS = BInt(magnitude: nonce)
+        let mappingBasePoint = ECPublicKey(privateKey: try ECPrivateKey(domain: domain, s: nonceS)) // S*G
+        printLog("Card Key x: \(mappingBasePoint.w.x.asMagnitudeBytes().toHex), y: \(mappingBasePoint.w.y.asMagnitudeBytes().toHex)")
+        let sharedSecretH = try domain.multiplyPoint(cardPubKey.w, terminalPrivKey.s)
+        printLog("Shared Secret x: \(sharedSecretH.x.asMagnitudeBytes().toHex), y: \(sharedSecretH.y.asMagnitudeBytes().toHex)")
+        let mappedPoint = try domain.addPoints(mappingBasePoint.w, sharedSecretH) // MAP G = (S*G) + H
+        printLog("Mapped point x: \(mappedPoint.x.asMagnitudeBytes().toHex), y: \(mappedPoint.y.asMagnitudeBytes().toHex)")
+        let mappedDomain = try Domain.instance(name: domain.name + " Mapped", p: domain.p, a: domain.a, b: domain.b, gx: mappedPoint.x, gy: mappedPoint.y, order: domain.order, cofactor: domain.cofactor)
+
+        // Ephemeral data
+        let (terminalEphemeralPubKey, terminalEphemeralPrivKey) = mappedDomain.makeKeyPair()
+        let ephemeralTag = try await tag.sendPaceCommand(records: [try TKBERTLVRecord(tag: 0x83, publicKey: terminalEphemeralPubKey)], tagExpected: 0x84)
+        printLog("Card Ephermal key \(ephemeralTag.data.toHex)")
+        let ephemeralCardPubKey = try ECPublicKey(domain: mappedDomain, tlv: ephemeralTag)!
+
+        // Derive shared secret and session keys
+        let sharedSecret = try terminalEphemeralPrivKey.sharedSecret(pubKey: ephemeralCardPubKey)
+        printLog("Shared secret \(sharedSecret.toHex)")
+        let ksEnc = KDF(key: sharedSecret, counter: 1)
+        let ksMac = KDF(key: sharedSecret, counter: 2)
+        printLog("KS.Enc \(ksEnc.toHex)")
+        printLog("KS.Mac \(ksMac.toHex)")
+
+        // Mutual authentication
+        let macHeader = Bytes(hex: "7f494f060a\(oid)8641")!
+        let macCalc = try AES.CMAC(key: ksMac)
+        let ephemeralCardPubKeyBytes = try ephemeralCardPubKey.x963Representation()
+        let macTag = try await tag.sendPaceCommand(records: [TKBERTLVRecord(tag: 0x85, bytes: (try macCalc.authenticate(bytes: macHeader + ephemeralCardPubKeyBytes)))], tagExpected: 0x86)
+        printLog("Mac response \(macTag.data.toHex)")
+
+        // verify chip's MAC and return session keys
+        let terminalEphemeralPubKeyBytes = try terminalEphemeralPubKey.x963Representation()
+        if  macTag.value == Data(try macCalc.authenticate(bytes: macHeader + terminalEphemeralPubKeyBytes)) {
+            return (ksEnc, ksMac)
+        }
+        return nil
+    }
+
+    func sendWrapped(tag: NFCISO7816Tag, cls: UInt8, ins: UInt8, p1: UInt8, p2: UInt8, data: Data, le: Int = -1) async throws -> Data {
+        guard SSC != nil else {
+            return try await tag.sendCommand(cls: cls, ins: ins, p1: p1, p2: p2, data: Data(), le: le)
+        }
+        _ = SSC!.increment()
+        let DO87: Data
+        if !data.isEmpty {
+            let iv = try AES.CBC(key: ksEnc!).encrypt(SSC!)
+            let enc_data = try AES.CBC(key: ksEnc!, iv: iv).encrypt(data.addPadding())
+            DO87 = TKBERTLVRecord(tag: 0x87, bytes: [0x01] + enc_data).data
+        } else {
+            DO87 = Data()
+        }
+        let DO97: Data
+        if le > 0 {
+            DO97 = TKBERTLVRecord(tag: 0x97, bytes: [UInt8(le == 256 ? 0 : le)]).data
+        } else {
+            DO97 = Data()
+        }
+        let cmd_header: Bytes = [cls | 0x0C, ins, p1, p2]
+        let M = cmd_header.addPadding() + DO87 + DO97
+        let N = SSC! + M
+        let mac = try AES.CMAC(key: ksMac!).authenticate(bytes: N.addPadding())
+        let DO8E = TKBERTLVRecord(tag: 0x8E, bytes: mac).data
+        let send = DO87 + DO97 + DO8E
+        printLog(">: \(send.toHex)")
+        let response = try await tag.sendCommand(cls: cmd_header[0], ins: ins, p1: p1, p2: p2, data: send, le: 256)
+        printLog("<: \(response.toHex)")
+        var tlvEnc: TKTLVRecord?
+        var tlvRes: TKTLVRecord?
+        var tlvMac: TKTLVRecord?
+        for tlv in TKBERTLVRecord.sequenceOfRecords(from: response)! {
+            switch tlv.tag {
+            case 0x87: tlvEnc = tlv
+            case 0x99: tlvRes = tlv
+            case 0x8E: tlvMac = tlv
+            default: printLog("Unknown tag")
+            }
+        }
+        guard tlvRes != nil else {
+            throw RuntimeError(msg: "Missing RES tag")
+        }
+        guard tlvMac != nil else {
+            throw RuntimeError(msg: "Missing MAC tag")
+        }
+        let K = SSC!.increment() + (tlvEnc?.data ?? Data()) + tlvRes!.data
+        if try Data(AES.CMAC(key: ksMac!).authenticate(bytes: K.addPadding())) != tlvMac!.value {
+            throw RuntimeError(msg: "Invalid MAC value")
+        }
+        if tlvRes!.value != Data([0x90, 0x00]) {
+            throw RuntimeError(msg: "\(tlvRes!.value.toHex)")
+        }
+        guard tlvEnc != nil else {
+            return Data()
+        }
+        let iv = try AES.CBC(key: ksEnc!).encrypt(SSC!)
+        let responseData = try AES.CBC(key: ksEnc!, iv: iv).decrypt(tlvEnc!.value[1...])
+        return Data(try responseData.removePadding())
+    }
+
+    func selectDF(tag: NFCISO7816Tag, file: Data) async throws {
+        _ = try await sendWrapped(tag: tag, cls: 0x00, ins: 0xA4, p1: file.isEmpty ? 0x00 : 0x01, p2: 0x0C, data: file, le: 256)
+    }
+
+    func selectEF(tag: NFCISO7816Tag, file: Data) async throws -> Int {
+        let data = try await sendWrapped(tag: tag, cls: 0x00, ins: 0xA4, p1: 0x02, p2: 0x04, data: file, le: 256)
+        guard let fci = TKBERTLVRecord(from: data) else {
+            return 0
+        }
+        for tlv in TKBERTLVRecord.sequenceOfRecords(from: fci.value)! where tlv.tag == 0x80 {
+            return Int(tlv.value[0]) << 8 | Int(tlv.value[1])
+        }
+        return 0
+    }
+
+    func readBinary(tag: NFCISO7816Tag, len: Int, pos: Int) async throws -> Data {
+        return try await sendWrapped(tag: tag, cls: 0x00, ins: 0xB0, p1: UInt8(pos >> 8), p2: UInt8(truncatingIfNeeded: pos), data: Data(), le: len)
+    }
+
+    func readBinary(tag: NFCISO7816Tag, len: Int) async throws -> Data {
+        var data = Data()
+        for i in stride(from: 0, to: len, by: 0xE0) {
+            data += try await readBinary(tag: tag, len: min(len - i, 0xE0), pos: i)
+        }
+        return data
+    }
+
+    func readEF(tag: NFCISO7816Tag, file: Data) async throws -> Data {
+        let len = try await selectEF(tag: tag, file: file)
+        return try await readBinary(tag: tag, len: len)
+    }
+
+    // MARK: - Utils
+
+    private func decryptNonce(encryptedNonce: any AES.DataType) throws -> Bytes {
+        let decryptionKey = KDF(key: Bytes(CAN!.utf8), counter: 3)
+        let cipher = AES.CBC(key: decryptionKey)
+        return try cipher.decrypt(encryptedNonce)
+    }
+
+    private func KDF(key: Bytes, counter: UInt8) -> Bytes {
+        var keydata = key + Bytes(repeating: 0x00, count: 4)
+        keydata[keydata.count - 1] = counter
+        return SHA256(data: keydata)
+    }
+
+    private func SHA256(data: Bytes) -> Bytes {
+        var hash = Bytes(repeating: 0x00, count: Int(CC_SHA256_DIGEST_LENGTH))
+        _ = data.withUnsafeBytes { bufferPointer in
+            CC_SHA256(bufferPointer.baseAddress, CC_LONG(data.count), &hash)
+        }
+        return hash
+    }
+}
+
+
+// MARK: - Extensions
+
+extension DataProtocol where Self.Index == Int {
+    var toHex: String {
+        return map { String(format: "%02x", $0) }.joined()
+    }
+
+    func chunked(into size: Int) -> [Bytes] {
+        return stride(from: 0, to: count, by: size).map {
+            Bytes(self[$0 ..< Swift.min($0 + size, count)])
+        }
+    }
+
+    func removePadding() throws -> SubSequence {
+        for i in stride(from: count - 1, through: 0, by: -1) {
+            if self[i] == 0x80 {
+                return self[0..<i]
+            } else if self[i] != 0x00 {
+                throw RuntimeError(msg: "Failed to remove padding")
+            }
+        }
+        throw RuntimeError(msg: "Failed to remove padding")
+    }
+}
+
+extension MutableDataProtocol where Self.Index == Int {
+    init?(hex: String) {
+        guard hex.count.isMultiple(of: 2) else { return nil }
+        let chars = hex.map { $0 }
+        let bytes = stride(from: 0, to: chars.count, by: 2)
+            .map { String(chars[$0]) + String(chars[$0 + 1]) }
+            .compactMap { UInt8($0, radix: 16) }
+        guard hex.count / bytes.count == 2 else { return nil }
+        self.init(bytes)
+    }
+
+    func addPadding() -> Self {
+        var padding = Self(repeating: 0x00, count: AES.BlockSize - count % AES.BlockSize)
+        padding[0] = 0x80
+        return self + padding
+    }
+
+    public static func ^ (x: Self, y: Self) -> Self {
+        var result = x
+        for i in 0..<result.count {
+            result[i] ^= y[i]
+        }
+        return result
+    }
+
+    mutating func increment() -> Self {
+        for i in (0..<count).reversed() {
+            self[i] += 1
+            if self[i] != 0 {
+                break
+            }
+        }
+        return self
+    }
+
+    func leftShiftOneBit() -> Self {
+        var shifted = Self(repeating: 0x00, count: count)
+        let last = count - 1
+        for index in 0..<last {
+            shifted[index] = self[index] << 1
+            if (self[index + 1] & 0x80) != 0 {
+                shifted[index] += 0x01
+            }
+        }
+        shifted[last] = self[last] << 1
+        return shifted
+    }
+
+    mutating func resize(to size: Index) -> Self {
+        self.removeSubrange(size..<endIndex)
+        return self
+    }
+}
+
+extension ECPublicKey {
+    convenience init?(domain: Domain, tlv: TKTLVRecord) throws {
+        guard let w = try? domain.decodePoint(Bytes(tlv.value)) else { return nil }
+        try self.init(domain: domain, w: w)
+    }
+
+    func x963Representation() throws -> Bytes {
+        return try domain.encodePoint(w)
+    }
+}
+
+extension NFCISO7816Tag {
+    func sendCommand(cls: UInt8, ins: UInt8, p1: UInt8, p2: UInt8, data: Data, le: Int = -1) async throws -> Data {
+        let apdu = NFCISO7816APDU(instructionClass: cls, instructionCode: ins, p1Parameter: p1, p2Parameter: p2, data: data, expectedResponseLength: le)
+        switch try await sendCommand(apdu: apdu) {
+        case (let data, 0x90, 0x00):
+            return data
+        case (let data, 0x61, let len):
+            return data + (try await sendCommand(cls: 0x00, ins: 0xC0, p1: 0x00, p2: 0x00, data: Data(), le: Int(len)))
+        case (_, 0x6C, let len):
+            return try await sendCommand(cls: cls, ins: ins, p1: p1, p2: p2, data: data, le: Int(len))
+        case (_, 0x63, let count) where count & 0xC0 > 0:
+            throw PinError(attemptsLeft: count & 0x0F)
+        case (_, 0x69, 0x83):
+            throw PinError(attemptsLeft: 0)
+        case (_, let sw1, let sw2):
+            throw RuntimeError(msg: String(format: "%02X%02X", sw1, sw2))
+        }
+    }
+
+    func sendPaceCommand(records: [TKTLVRecord], tagExpected: TKTLVTag) async throws -> TKBERTLVRecord {
+        let request = TKBERTLVRecord(tag: 0x7c, records: records)
+        let data = try await sendCommand(cls: tagExpected == 0x86 ? 0x00 : 0x10, ins: 0x86, p1: 0x00, p2: 0x00, data: request.data, le: 256)
+        if let response = TKBERTLVRecord(from: data), response.tag == 0x7c,
+           let result = TKBERTLVRecord(from: response.value), result.tag == tagExpected {
+            return result
+        }
+        throw RuntimeError(msg: "Invalid response")
+    }
+}
+
+extension TKBERTLVRecord {
+    convenience init(tag: TKTLVTag, bytes: Bytes) {
+        self.init(tag: tag, value: Data(bytes))
+    }
+
+    convenience init(tag: TKTLVTag, publicKey: ECPublicKey) throws {
+        self.init(tag: tag, bytes: (try publicKey.x963Representation()))
+    }
+}
+
+// MARK: - AES
+class AES {
+    public typealias DataType = DataProtocol & ContiguousBytes
+    static let BlockSize: Int = kCCBlockSizeAES128
+    static let Zero = Bytes(repeating: 0x00, count: BlockSize)
+
+    public class CBC {
+        private let key: any DataType
+        private let iv: any DataType
+
+        init(key: any DataType, iv: any DataType = Zero) {
+            self.key = key
+            self.iv = iv
+        }
+
+        func encrypt(_ data: any DataType) throws -> Bytes {
+            return try crypt(data: data, operation: kCCEncrypt)
+        }
+
+        func decrypt(_ data: any DataType) throws -> Bytes {
+            return try crypt(data: data, operation: kCCDecrypt)
+        }
+
+        private func crypt(data: any DataType, operation: Int) throws -> Bytes {
+            var bytesWritten = 0
+            var outputBuffer = Bytes(repeating: 0, count: data.count + BlockSize)
+            let status = data.withUnsafeBytes { dataBytes in
+                iv.withUnsafeBytes { ivBytes in
+                    key.withUnsafeBytes { keyBytes in
+                        CCCrypt(
+                            CCOperation(operation),
+                            CCAlgorithm(kCCAlgorithmAES),
+                            CCOptions(0), //kCCOptionPKCS7Padding),
+                            keyBytes.baseAddress,
+                            key.count,
+                            ivBytes.baseAddress,
+                            dataBytes.baseAddress,
+                            data.count,
+                            &outputBuffer,
+                            outputBuffer.count,
+                            &bytesWritten
+                        )
+                    }
+                }
+            }
+            if status != kCCSuccess {
+                throw RuntimeError(msg: "AES.CBC.Error")
+            }
+            return outputBuffer.resize(to: bytesWritten)
+        }
+    }
+
+    public class CMAC {
+        static let Rb: Bytes = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87]
+        let cipher: AES.CBC
+        let K1: Bytes
+        let K2: Bytes
+
+        public init(key: any DataType) throws {
+            cipher = AES.CBC(key: key)
+            let L = try cipher.encrypt(Zero)
+            K1 = (L[0] & 0x80) == 0 ? L.leftShiftOneBit() : L.leftShiftOneBit() ^ CMAC.Rb
+            K2 = (K1[0] & 0x80) == 0 ? K1.leftShiftOneBit() : K1.leftShiftOneBit() ^ CMAC.Rb
+        }
+
+        public func authenticate<T : DataType>(bytes: T, count: Int = 8) throws -> Bytes where T.Index == Int {
+            let n = ceil(Double(bytes.count) / Double(BlockSize))
+            let lastBlockComplete: Bool
+            if n == 0 {
+                lastBlockComplete = false
+            } else {
+                lastBlockComplete = bytes.count % BlockSize == 0
+            }
+
+            var blocks = bytes.chunked(into: BlockSize)
+            var M_last = blocks.popLast() ?? Bytes()
+            if lastBlockComplete {
+                M_last = M_last ^ K1
+            } else {
+                M_last = M_last.addPadding() ^ K2
+            }
+
+            var x = Bytes(repeating: 0x00, count: BlockSize)
+            var y: Bytes
+            for M_i in blocks {
+                y = x ^ M_i
+                x = try cipher.encrypt(y)
+            }
+            y = M_last ^ x
+            var T = try cipher.encrypt(y)
+            return T.resize(to: count)
+        }
+    }
+}
diff --git a/MoppApp/MoppApp/SigningActions.swift b/MoppApp/MoppApp/SigningActions.swift
index 489a04a33..4418bf0da 100644
--- a/MoppApp/MoppApp/SigningActions.swift
+++ b/MoppApp/MoppApp/SigningActions.swift
@@ -80,6 +80,7 @@ extension SigningActions where Self: SigningContainerViewController {
         signSelectionVC.mobileIdEditViewControllerDelegate = self
         signSelectionVC.smartIdEditViewControllerDelegate = self
         signSelectionVC.idCardSignViewControllerDelegate = self
+        signSelectionVC.nfcEditViewControllerDelegate = self
         signSelectionVC.containerPath = containerPath
         
         return signSelectionVC
@@ -181,6 +182,14 @@ extension SigningContainerViewController : SmartIDEditViewControllerDelegate {
     }
 }
 
+extension SigningContainerViewController : NFCEditViewControllerDelegate {
+    func nfcEditViewControllerDidDismiss(cancelled: Bool, can: String?, pin: String?) {
+        if !cancelled, let can = can, let pin = pin {
+            NFCSignature.shared.createNFCSignature(can: can, pin: pin, containerPath: self.containerViewDelegate.getContainerPath(), hashType: kHashType, roleData: DefaultsHelper.isRoleAndAddressEnabled ? RoleAndAddressUtil.getSavedRoleInfo() : nil)
+        }
+    }
+}
+
 extension SigningContainerViewController : IdCardSignViewControllerDelegate {
     func idCardSignDidFinished(cancelled: Bool, success: Bool, error: Error?) {
         if !cancelled {
diff --git a/MoppApp/MoppApp/SigningContainerViewController.swift b/MoppApp/MoppApp/SigningContainerViewController.swift
index eab5e63a9..87f6800be 100644
--- a/MoppApp/MoppApp/SigningContainerViewController.swift
+++ b/MoppApp/MoppApp/SigningContainerViewController.swift
@@ -23,6 +23,7 @@
 
 import UIKit
 import MoppLib
+import SkSigningLib
 
 class SigningContainerViewController : ContainerViewController, SigningActions, UIDocumentPickerDelegate {
     
@@ -348,11 +349,24 @@ extension SigningContainerViewController : ContainerViewControllerDelegate {
     }
     
     @objc func receiveErrorNotification(_ notification: Notification) {
-        DispatchQueue.main.async {
-            self.dismiss(animated: false) {
-                let topViewController = self.getTopViewController()
-                AlertUtil.errorMessageDialog(notification, topViewController: topViewController)
+        if !isNFCCancelled(notification: notification) {
+            DispatchQueue.main.async {
+                self.dismiss(animated: false) {
+                    let topViewController = self.getTopViewController()
+                    AlertUtil.errorMessageDialog(notification, topViewController: topViewController)
+                }
             }
         }
     }
+    
+    func isNFCCancelled(notification: Notification) -> Bool {
+        guard let userInfo = notification.userInfo else { return false }
+        let error = userInfo[kErrorKey] as? NSError
+        let signingError = error?.userInfo[NSLocalizedDescriptionKey] as? SigningError
+        
+        guard let signError = signingError, signError == .nfcCancelled else {
+            return false
+        }
+        return true
+    }
 }
diff --git a/MoppApp/MoppApp/TokenFlow.storyboard b/MoppApp/MoppApp/TokenFlow.storyboard
index 9f1950997..ca025fa8c 100644
--- a/MoppApp/MoppApp/TokenFlow.storyboard
+++ b/MoppApp/MoppApp/TokenFlow.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -46,7 +46,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="311" height="41"/>
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wT5-SD-vv8" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
-                                                                <rect key="frame" x="0.0" y="0.0" width="103.5" height="41"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="78" height="41"/>
                                                                 <color key="backgroundColor" red="0.015686274510000001" green="0.1176470588" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <accessibility key="accessibilityConfiguration" identifier="mobileID"/>
                                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="17"/>
@@ -58,7 +58,7 @@
                                                                 </connections>
                                                             </button>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="POy-sV-1Yt" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
-                                                                <rect key="frame" x="103.5" y="0.0" width="104" height="41"/>
+                                                                <rect key="frame" x="78" y="0.0" width="77.5" height="41"/>
                                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <accessibility key="accessibilityConfiguration" identifier="smartID"/>
                                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="17"/>
@@ -70,7 +70,7 @@
                                                                 </connections>
                                                             </button>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F3T-ze-EzN" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
-                                                                <rect key="frame" x="207.5" y="0.0" width="103.5" height="41"/>
+                                                                <rect key="frame" x="155.5" y="0.0" width="78" height="41"/>
                                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <accessibility key="accessibilityConfiguration" identifier="idCard"/>
                                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="17"/>
@@ -81,6 +81,18 @@
                                                                     <action selector="didTapSignMethodButtonWithSender:" destination="hR2-nA-Heu" eventType="touchUpInside" id="2VM-Gp-ofT"/>
                                                                 </connections>
                                                             </button>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fkh-nV-pZI" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
+                                                                <rect key="frame" x="233.5" y="0.0" width="77.5" height="41"/>
+                                                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <accessibility key="accessibilityConfiguration" identifier="nfc"/>
+                                                                <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="17"/>
+                                                                <state key="normal" title="NFC">
+                                                                    <color key="titleColor" red="0.015686274510000001" green="0.1176470588" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                </state>
+                                                                <connections>
+                                                                    <action selector="didTapSignMethodButtonWithSender:" destination="hR2-nA-Heu" eventType="touchUpInside" id="PH5-sv-XFU"/>
+                                                                </connections>
+                                                            </button>
                                                         </subviews>
                                                     </stackView>
                                                 </subviews>
@@ -161,6 +173,7 @@
                         <outlet property="containerViewHeightCSTR" destination="r73-vf-B3d" id="8kY-RR-SRH"/>
                         <outlet property="idCardButton" destination="F3T-ze-EzN" id="7Ko-G9-cW3"/>
                         <outlet property="mobileIDButton" destination="wT5-SD-vv8" id="rjg-xa-AvI"/>
+                        <outlet property="nfcButton" destination="fkh-nV-pZI" id="tK0-Yr-23P"/>
                         <outlet property="smartIDButton" destination="POy-sV-1Yt" id="Kht-HS-XUe"/>
                         <outlet property="tokenFlowView" destination="jHz-uj-av0" id="shN-fw-2Cl"/>
                         <outlet property="tokenFlowViewCenterXCSTR" destination="EaQ-2z-gUj" id="kP9-FV-iOK"/>
@@ -174,6 +187,7 @@
                         <outletCollection property="tokenFlowMethodButtons" destination="POy-sV-1Yt" collectionClass="NSMutableArray" id="6wN-jC-1Xw"/>
                         <outletCollection property="tokenFlowMethodButtons" destination="wT5-SD-vv8" collectionClass="NSMutableArray" id="jhC-8w-F5L"/>
                         <outletCollection property="tokenFlowMethodButtons" destination="F3T-ze-EzN" collectionClass="NSMutableArray" id="UOu-8I-uqi"/>
+                        <outletCollection property="tokenFlowMethodButtons" destination="fkh-nV-pZI" collectionClass="NSMutableArray" id="UOu-8I-uqj"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4Dd-Jj-Osd" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -274,16 +288,16 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="2SI-uc-qHu">
-                                                <rect key="frame" x="25" y="285" width="325" height="31"/>
+                                                <rect key="frame" x="25" y="285" width="318" height="31"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Remember me" textAlignment="right" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.10000000000000001" translatesAutoresizingMaskIntoConstraints="NO" id="lF6-VQ-sny" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="6" width="268" height="19"/>
+                                                        <rect key="frame" x="0.0" y="6" width="261" height="19"/>
                                                         <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
                                                         <color key="textColor" name="MoppText"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="right" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MHH-mX-gAV" customClass="SwitchButton" customModule="MoppApp" customModuleProvider="target">
-                                                        <rect key="frame" x="276" y="0.0" width="51" height="31"/>
+                                                        <rect key="frame" x="269" y="0.0" width="51" height="31"/>
                                                         <color key="onTintColor" red="0.54901960780000003" green="0.76470588240000004" blue="0.40784313729999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </switch>
                                                 </subviews>
@@ -347,7 +361,7 @@
                                             <constraint firstItem="d36-rR-XNQ" firstAttribute="top" secondItem="ZxA-C9-eha" secondAttribute="bottom" constant="8" symbolic="YES" id="Zh8-cM-0ll"/>
                                             <constraint firstAttribute="bottom" secondItem="95R-Su-8D4" secondAttribute="bottom" constant="45" id="cU5-Oq-sUl"/>
                                             <constraint firstItem="BDG-gM-UKf" firstAttribute="leading" secondItem="nKU-2c-pC3" secondAttribute="leading" constant="25" id="cdb-3W-nxm"/>
-                                            <constraint firstAttribute="trailing" secondItem="2SI-uc-qHu" secondAttribute="trailing" constant="25" id="ddt-7r-fzf"/>
+                                            <constraint firstAttribute="trailing" secondItem="2SI-uc-qHu" secondAttribute="trailing" constant="32" id="ddt-7r-fzf"/>
                                             <constraint firstItem="W3G-Hw-MUO" firstAttribute="leading" secondItem="nKU-2c-pC3" secondAttribute="leading" constant="25" id="gHP-dK-kwf"/>
                                             <constraint firstAttribute="trailing" secondItem="W3G-Hw-MUO" secondAttribute="trailing" constant="25" id="i0m-LD-rBq"/>
                                             <constraint firstItem="XKc-V5-sgL" firstAttribute="leading" secondItem="nKU-2c-pC3" secondAttribute="leading" constant="25" id="lkZ-52-7rI"/>
@@ -855,16 +869,16 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="fCo-6o-vIX">
-                                                <rect key="frame" x="25" y="269" width="293" height="31"/>
+                                                <rect key="frame" x="25" y="269" width="286" height="31"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Remember me" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UZY-ex-JFh" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="6" width="236" height="19"/>
+                                                        <rect key="frame" x="0.0" y="6" width="229" height="19"/>
                                                         <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
                                                         <color key="textColor" name="MoppText"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="right" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7QK-Af-BRR" customClass="SwitchButton" customModule="MoppApp" customModuleProvider="target">
-                                                        <rect key="frame" x="244" y="0.0" width="51" height="31"/>
+                                                        <rect key="frame" x="237" y="0.0" width="51" height="31"/>
                                                     </switch>
                                                 </subviews>
                                             </stackView>
@@ -911,7 +925,7 @@
                                         </subviews>
                                         <gestureRecognizers/>
                                         <constraints>
-                                            <constraint firstAttribute="trailing" secondItem="fCo-6o-vIX" secondAttribute="trailing" constant="25" id="0Dy-Gl-llz"/>
+                                            <constraint firstAttribute="trailing" secondItem="fCo-6o-vIX" secondAttribute="trailing" constant="32" id="0Dy-Gl-llz"/>
                                             <constraint firstItem="box-bm-6ia" firstAttribute="top" secondItem="Rxc-7T-6sI" secondAttribute="bottom" constant="8" symbolic="YES" id="1Su-jX-6A8"/>
                                             <constraint firstItem="7Gf-b9-BOl" firstAttribute="leading" secondItem="W1Q-YB-hgR" secondAttribute="leading" constant="25" id="4Xe-ee-XCN"/>
                                             <constraint firstItem="LBJ-L2-OkC" firstAttribute="leading" secondItem="W1Q-YB-hgR" secondAttribute="leading" constant="32" id="8cb-QS-iXQ"/>
@@ -1388,6 +1402,219 @@
             </objects>
             <point key="canvasLocation" x="-748" y="1708.2458770614694"/>
         </scene>
+        <!--NFC Edit View Controller-->
+        <scene sceneID="OHO-zS-x9G">
+            <objects>
+                <viewController storyboardIdentifier="NFCEditViewController" id="3pJ-M2-a5W" userLabel="NFC Edit View Controller" customClass="NFCEditViewController" customModule="MoppApp" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="e22-6l-LR1"/>
+                        <viewControllerLayoutGuide type="bottom" id="CLH-iW-Sfv"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="mHx-KW-nze">
+                        <rect key="frame" x="0.0" y="0.0" width="343" height="410"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P5l-wP-Uoo">
+                                <rect key="frame" x="0.0" y="20" width="343" height="390"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mnI-M7-BHK">
+                                        <rect key="frame" x="0.0" y="0.0" width="343" height="385.5"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" text="Enter your card CAN and PIN2 to sign with ID-card" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rjC-XY-qFD" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="32" y="16" width="279" height="44.5"/>
+                                                <accessibility key="accessibilityConfiguration">
+                                                    <accessibilityTraits key="traits" staticText="YES" header="YES"/>
+                                                </accessibility>
+                                                <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="19"/>
+                                                <color key="textColor" red="0.015686274510000001" green="0.1176470588" blue="0.25882352939999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Card access number" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pCt-vy-MdB" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="25" y="76.5" width="293" height="15.5"/>
+                                                <accessibility key="accessibilityConfiguration">
+                                                    <accessibilityTraits key="traits" staticText="YES"/>
+                                                    <bool key="isElement" value="NO"/>
+                                                </accessibility>
+                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="13"/>
+                                                <color key="textColor" red="0.45882352939999999" green="0.47058823529999999" blue="0.4823529412" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <textField opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="nLi-7a-MsG" customClass="MyTextField" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="25" y="100.5" width="293" height="46"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <accessibility key="accessibilityConfiguration" identifier="nfcCanField"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="46" id="dyI-xk-L3j"/>
+                                                </constraints>
+                                                <color key="textColor" red="0.21176470589999999" green="0.2156862745" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
+                                                <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                        <integer key="value" value="4"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                            </textField>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid card access number" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="afX-4g-ZPX" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="25" y="154.5" width="293" height="15.5"/>
+                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="13"/>
+                                                <color key="textColor" name="MoppError"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter PIN2" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MZs-mQ-MWX" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="25" y="186" width="293" height="15.5"/>
+                                                <accessibility key="accessibilityConfiguration">
+                                                    <bool key="isElement" value="NO"/>
+                                                </accessibility>
+                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="13"/>
+                                                <color key="textColor" red="0.45882352939999999" green="0.47058823529999999" blue="0.4823529412" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DQo-E7-fVV" customClass="MyTextField" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="25" y="209" width="293" height="46"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <accessibility key="accessibilityConfiguration" identifier="nfcPinField"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="46" id="d7z-B9-OcE"/>
+                                                </constraints>
+                                                <color key="textColor" red="0.21176470589999999" green="0.2156862745" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
+                                                <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done" secureTextEntry="YES"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                        <integer key="value" value="4"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                                <connections>
+                                                    <outlet property="delegate" destination="3pJ-M2-a5W" id="e2y-vn-TxE"/>
+                                                </connections>
+                                            </textField>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid PIN code" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6h2-T5-xe7" customClass="ScaledLabel" customModule="MoppApp" customModuleProvider="target">
+                                                <rect key="frame" x="25" y="263" width="293" height="15.5"/>
+                                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="13"/>
+                                                <color key="textColor" name="MoppError"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="0hb-jd-IP1">
+                                                <rect key="frame" x="25" y="303.5" width="293" height="32"/>
+                                                <subviews>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ydU-Wj-AnM" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
+                                                        <rect key="frame" x="0.0" y="0.0" width="144" height="32"/>
+                                                        <color key="backgroundColor" name="MoppError"/>
+                                                        <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="17"/>
+                                                        <state key="normal">
+                                                            <color key="titleColor" red="0.9630651563" green="0.9630651563" blue="0.9630651563" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </state>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                <integer key="value" value="2"/>
+                                                            </userDefinedRuntimeAttribute>
+                                                        </userDefinedRuntimeAttributes>
+                                                        <connections>
+                                                            <action selector="cancelAction" destination="3pJ-M2-a5W" eventType="touchUpInside" id="pto-qW-Fgz"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sBY-Tp-x3O" customClass="ScaledButton" customModule="MoppApp" customModuleProvider="target">
+                                                        <rect key="frame" x="149" y="0.0" width="144" height="32"/>
+                                                        <color key="backgroundColor" red="0.0" green="0.43137254899999999" blue="0.70980392160000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="17"/>
+                                                        <state key="normal">
+                                                            <color key="titleColor" red="0.9630651563" green="0.9630651563" blue="0.9630651563" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        </state>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                <integer key="value" value="2"/>
+                                                            </userDefinedRuntimeAttribute>
+                                                        </userDefinedRuntimeAttributes>
+                                                        <connections>
+                                                            <action selector="signAction" destination="3pJ-M2-a5W" eventType="touchUpInside" id="SaY-0A-HC0"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="sBY-Tp-x3O" firstAttribute="width" secondItem="ydU-Wj-AnM" secondAttribute="width" id="N23-sE-Ky7"/>
+                                                </constraints>
+                                            </stackView>
+                                        </subviews>
+                                        <gestureRecognizers/>
+                                        <constraints>
+                                            <constraint firstItem="0hb-jd-IP1" firstAttribute="top" secondItem="6h2-T5-xe7" secondAttribute="bottom" constant="25" id="2J9-K1-RA6"/>
+                                            <constraint firstItem="MZs-mQ-MWX" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="2m3-Hq-65T"/>
+                                            <constraint firstItem="0hb-jd-IP1" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="3ue-Sj-N6b"/>
+                                            <constraint firstItem="nLi-7a-MsG" firstAttribute="top" secondItem="pCt-vy-MdB" secondAttribute="bottom" constant="8.5" id="5w4-Wb-oJY"/>
+                                            <constraint firstAttribute="bottom" secondItem="0hb-jd-IP1" secondAttribute="bottom" constant="50" id="7xj-g0-E0Q"/>
+                                            <constraint firstItem="rjC-XY-qFD" firstAttribute="top" secondItem="mnI-M7-BHK" secondAttribute="top" constant="16" id="Ize-hX-gda"/>
+                                            <constraint firstAttribute="trailing" secondItem="MZs-mQ-MWX" secondAttribute="trailing" constant="25" id="LX2-yJ-ISj"/>
+                                            <constraint firstItem="DQo-E7-fVV" firstAttribute="top" secondItem="MZs-mQ-MWX" secondAttribute="bottom" constant="7.5" id="M4i-Tu-clC"/>
+                                            <constraint firstAttribute="trailing" secondItem="6h2-T5-xe7" secondAttribute="trailing" constant="25" id="Moo-iA-C8z"/>
+                                            <constraint firstItem="MZs-mQ-MWX" firstAttribute="top" secondItem="afX-4g-ZPX" secondAttribute="bottom" constant="16" id="NTa-4U-NtB"/>
+                                            <constraint firstItem="rjC-XY-qFD" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="32" id="RDz-al-lt6"/>
+                                            <constraint firstAttribute="trailing" secondItem="rjC-XY-qFD" secondAttribute="trailing" constant="32" id="aUN-rk-ffR"/>
+                                            <constraint firstAttribute="trailing" secondItem="pCt-vy-MdB" secondAttribute="trailing" constant="25" id="cQD-Ql-OdU"/>
+                                            <constraint firstAttribute="trailing" secondItem="afX-4g-ZPX" secondAttribute="trailing" constant="25" id="cSn-2V-zUU"/>
+                                            <constraint firstItem="6h2-T5-xe7" firstAttribute="top" secondItem="DQo-E7-fVV" secondAttribute="bottom" constant="8" symbolic="YES" id="cZF-Xj-ThF"/>
+                                            <constraint firstItem="DQo-E7-fVV" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="dOd-XS-QXT"/>
+                                            <constraint firstAttribute="trailing" secondItem="nLi-7a-MsG" secondAttribute="trailing" constant="25" id="hwS-HE-JVi"/>
+                                            <constraint firstItem="afX-4g-ZPX" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="kKI-Sj-3ah"/>
+                                            <constraint firstAttribute="trailing" secondItem="0hb-jd-IP1" secondAttribute="trailing" constant="25" id="kZO-hJ-1Lo"/>
+                                            <constraint firstItem="nLi-7a-MsG" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="kik-Pd-6tg"/>
+                                            <constraint firstItem="afX-4g-ZPX" firstAttribute="top" secondItem="nLi-7a-MsG" secondAttribute="bottom" constant="8" symbolic="YES" id="ot3-Jz-psA"/>
+                                            <constraint firstItem="pCt-vy-MdB" firstAttribute="top" secondItem="rjC-XY-qFD" secondAttribute="bottom" constant="16" id="oxj-KM-EpR"/>
+                                            <constraint firstItem="pCt-vy-MdB" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="rbC-bx-Aw9"/>
+                                            <constraint firstAttribute="trailing" secondItem="DQo-E7-fVV" secondAttribute="trailing" constant="25" id="rl1-CG-wA7"/>
+                                            <constraint firstItem="6h2-T5-xe7" firstAttribute="leading" secondItem="mnI-M7-BHK" secondAttribute="leading" constant="25" id="wG4-fj-LF0"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                <integer key="value" value="4"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                        <connections>
+                                            <outletCollection property="gestureRecognizers" destination="RR6-7m-abm" appends="YES" id="22K-6Z-Jj6"/>
+                                        </connections>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="mnI-M7-BHK" firstAttribute="width" secondItem="P5l-wP-Uoo" secondAttribute="width" id="538-Qk-MKd"/>
+                                    <constraint firstAttribute="bottom" secondItem="mnI-M7-BHK" secondAttribute="bottom" id="ARp-Wa-BgM"/>
+                                    <constraint firstItem="mnI-M7-BHK" firstAttribute="top" secondItem="P5l-wP-Uoo" secondAttribute="top" id="C7H-AD-nid"/>
+                                    <constraint firstItem="mnI-M7-BHK" firstAttribute="leading" secondItem="P5l-wP-Uoo" secondAttribute="leading" id="GM4-gC-2If"/>
+                                    <constraint firstAttribute="trailing" secondItem="mnI-M7-BHK" secondAttribute="trailing" id="I2m-tU-7kk"/>
+                                    <constraint firstItem="mnI-M7-BHK" firstAttribute="height" secondItem="P5l-wP-Uoo" secondAttribute="height" priority="250" id="psD-O9-upN"/>
+                                </constraints>
+                                <viewLayoutGuide key="contentLayoutGuide" id="Wdd-15-EJz"/>
+                                <viewLayoutGuide key="frameLayoutGuide" id="vuR-Fo-kRO"/>
+                            </scrollView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="25y-eT-ZMW"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="25y-eT-ZMW" firstAttribute="bottom" secondItem="P5l-wP-Uoo" secondAttribute="bottom" id="8dd-sU-4EV"/>
+                            <constraint firstItem="P5l-wP-Uoo" firstAttribute="leading" secondItem="25y-eT-ZMW" secondAttribute="leading" id="EfX-Q1-iH8"/>
+                            <constraint firstItem="P5l-wP-Uoo" firstAttribute="top" secondItem="25y-eT-ZMW" secondAttribute="top" id="ern-wi-gma"/>
+                            <constraint firstItem="25y-eT-ZMW" firstAttribute="trailing" secondItem="P5l-wP-Uoo" secondAttribute="trailing" id="sYl-Lt-7vL"/>
+                        </constraints>
+                    </view>
+                    <size key="freeformSize" width="343" height="410"/>
+                    <connections>
+                        <outlet property="canTextErrorLabel" destination="afX-4g-ZPX" id="HPg-94-4te"/>
+                        <outlet property="canTextField" destination="nLi-7a-MsG" id="QVm-Z8-jGl"/>
+                        <outlet property="canTextLabel" destination="pCt-vy-MdB" id="x05-tb-OSS"/>
+                        <outlet property="cancelButton" destination="ydU-Wj-AnM" id="FZv-2h-1mi"/>
+                        <outlet property="pinTextErrorLabel" destination="6h2-T5-xe7" id="1Jb-wb-A6j"/>
+                        <outlet property="pinTextField" destination="DQo-E7-fVV" id="nGN-3e-3kr"/>
+                        <outlet property="pinTextLabel" destination="MZs-mQ-MWX" id="Dfd-su-wmT"/>
+                        <outlet property="scrollView" destination="P5l-wP-Uoo" id="Nkv-kg-8tB"/>
+                        <outlet property="signButton" destination="sBY-Tp-x3O" id="NnD-lr-08B"/>
+                        <outlet property="titleLabel" destination="rjC-XY-qFD" id="lIf-Ce-fGX"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="oZg-Zs-Oko" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <tapGestureRecognizer id="RR6-7m-abm" userLabel="ParentViewTapRecognizerBlocker"/>
+            </objects>
+            <point key="canvasLocation" x="164" y="2134.6326836581711"/>
+        </scene>
     </scenes>
     <resources>
         <image name="Spinner" width="50" height="50"/>
diff --git a/MoppApp/MoppApp/TokenFlowSelectionViewController.swift b/MoppApp/MoppApp/TokenFlowSelectionViewController.swift
index 99de52877..f57eea0a4 100644
--- a/MoppApp/MoppApp/TokenFlowSelectionViewController.swift
+++ b/MoppApp/MoppApp/TokenFlowSelectionViewController.swift
@@ -36,7 +36,8 @@ class TokenFlowSelectionViewController : MoppViewController {
     @IBOutlet weak var mobileIDButton: ScaledButton!
     @IBOutlet weak var smartIDButton: ScaledButton!
     @IBOutlet weak var idCardButton: ScaledButton!
-    
+    @IBOutlet weak var nfcButton: ScaledButton!
+
     @IBOutlet weak var tokenViewContainerTopConstraint: NSLayoutConstraint!
     @IBOutlet weak var tokenFlowViewLeadingCSTR: NSLayoutConstraint!
     @IBOutlet weak var tokenFlowViewTrailingCSTR: NSLayoutConstraint!
@@ -51,7 +52,8 @@ class TokenFlowSelectionViewController : MoppViewController {
     weak var smartIdEditViewControllerDelegate: SmartIDEditViewControllerDelegate!
     weak var idCardSignViewControllerDelegate: IdCardSignViewControllerDelegate?
     weak var idCardDecryptViewControllerDelegate: IdCardDecryptViewControllerDelegate?
-    
+    weak var nfcEditViewControllerDelegate: NFCEditViewControllerDelegate!
+
     var containerPath: String!
     
     var isSwitchingBlockedByTransition: Bool = false
@@ -71,6 +73,7 @@ class TokenFlowSelectionViewController : MoppViewController {
         case mobileID
         case smartID
         case idCard
+        case nfc
     }
     
     override func viewDidLoad() {
@@ -127,19 +130,24 @@ class TokenFlowSelectionViewController : MoppViewController {
             switch id {
             case .idCard:
                 $0.setTitle(L(.signTitleIdCard))
-                idCardButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleIdCard), positionInRow: "3", viewCount: "3")
+                idCardButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleIdCard), positionInRow: "3", viewCount: "4")
                 idCardButton.accessibilityUserInputLabels = [L(.voiceControlIdCard)]
                 idCardButton.adjustedFont()
             case .mobileID:
                 $0.setTitle(L(.signTitleMobileId))
-                mobileIDButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleMobileId), positionInRow: "1", viewCount: "3")
+                mobileIDButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleMobileId), positionInRow: "1", viewCount: "4")
                 mobileIDButton.accessibilityUserInputLabels = [L(.voiceControlMobileId)]
                 mobileIDButton.adjustedFont()
             case .smartID:
                 $0.setTitle(L(.signTitleSmartId))
-                smartIDButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleSmartId), positionInRow: "2", viewCount: "3")
+                smartIDButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleSmartId), positionInRow: "2", viewCount: "4")
                 smartIDButton.accessibilityUserInputLabels = [L(.voiceControlSmartId)]
                 smartIDButton.adjustedFont()
+            case .nfc:
+                $0.setTitle(L(.signTitleNFC))
+                nfcButton.accessibilityLabel = setTabAccessibilityLabel(isTabSelected: false, tabName: L(.signTitleNFC), positionInRow: "4", viewCount: "4")
+                nfcButton.accessibilityUserInputLabels = [L(.signTitleNFC)]
+                nfcButton.adjustedFont()
             }
         }
     }
@@ -191,19 +199,25 @@ extension TokenFlowSelectionViewController {
             }
             idCardSignVC.keyboardDelegate = self
             newViewController = idCardSignVC
-            viewAccessibilityElements = [idCardButton, containerView, mobileIDButton,  smartIDButton, containerView]
+            viewAccessibilityElements = [idCardButton, containerView, mobileIDButton, smartIDButton, nfcButton, containerView]
+        case .nfc:
+            let nfcSignVC = UIStoryboard.tokenFlow.instantiateViewController(of: NFCEditViewController.self)
+            centerLandscapeCSTR.isActive = false
+            nfcSignVC.delegate = nfcEditViewControllerDelegate
+            newViewController = nfcSignVC
+            viewAccessibilityElements = [nfcButton, containerView, idCardButton, mobileIDButton, smartIDButton, containerView]
         case .mobileID:
             let mobileIdEditVC = UIStoryboard.tokenFlow.instantiateViewController(of: MobileIDEditViewController.self)
             handleConstraintInLandscape()
             mobileIdEditVC.delegate = mobileIdEditViewControllerDelegate
             newViewController = mobileIdEditVC
-            viewAccessibilityElements = [mobileIDButton, containerView, smartIDButton, idCardButton, containerView]
+            viewAccessibilityElements = [mobileIDButton, containerView, smartIDButton, idCardButton, nfcButton, containerView]
         case .smartID:
             let smartIdEditVC = UIStoryboard.tokenFlow.instantiateViewController(of: SmartIDEditViewController.self)
             handleConstraintInLandscape()
             smartIdEditVC.delegate = smartIdEditViewControllerDelegate
             newViewController = smartIdEditVC
-            viewAccessibilityElements = [smartIDButton, containerView, idCardButton, mobileIDButton, smartIDButton, containerView]
+            viewAccessibilityElements = [smartIDButton, containerView, idCardButton, mobileIDButton, smartIDButton, nfcButton, containerView]
         }
         
         if UIAccessibility.isVoiceOverRunning {
diff --git a/MoppApp/MoppApp/en.lproj/Localizable.strings b/MoppApp/MoppApp/en.lproj/Localizable.strings
index e350c876d..5f7f3d9e8 100755
--- a/MoppApp/MoppApp/en.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/en.lproj/Localizable.strings
@@ -230,6 +230,20 @@
 "smart-id-country-latvia" = "Latvia";
 "smart-id-challenge-title" = "Sign with Smart-ID";
 "smart-id-sign-help-title" = "Make sure control code matches with one in phone screen and enter Smart-ID PIN2 code";
+"nfc-title" = "Enter your ID-card access number and PIN2 code to sign with ID-card";
+"nfc-can-title" = "ID-card access number";
+"nfc-device-no-support" = "This device does not support NFC.";
+"nfc-hold-near" = "Hold your phone near the ID-card";
+"nfc-multiple-cards" = "More than 1 NFC tag is detected, please remove all NFC tags and try again";
+"nfc-invalid-tag" = "Invalid NFC tag";
+"nfc-unable-connect" = "Unable to connect to NFC tag";
+"nfc-auth" = "Authenticating with ID-card";
+"nfc-reading-cert" = "Reading certificate";
+"nfc-sign-doc" = "Signing document";
+"nfc-sign-done" = "Signing done";
+"nfc-auth-failed" = "Failed to authenticate with ID-card";
+"nfc-sign-failed" = "Failed to sign document with ID-card";
+"nfc-pin-locked" = "Locked PIN";
 "role-and-address" = "Role and address";
 "role-and-address-title" = "Enter your role and address info";
 "role-and-address-role-title" = "Role / resolution";
@@ -253,6 +267,7 @@
 "sign-title-mobile-id" = "Mobile-ID";
 "sign-title-smart-id" = "Smart-ID";
 "sign-title-id-card" = "ID-Card";
+"sign-title-nfc" = "NFC";
 "card-reader-state-initial" = "Connect the card reader and insert your ID-card into the reader.";
 "card-reader-state-reader-not-found" = "No card readers found";
 "card-reader-state-reader-restarted" = "Restarting card reader.";
diff --git a/MoppApp/MoppApp/et.lproj/Localizable.strings b/MoppApp/MoppApp/et.lproj/Localizable.strings
index 36bea1ccd..35909f697 100755
--- a/MoppApp/MoppApp/et.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/et.lproj/Localizable.strings
@@ -231,6 +231,20 @@
 "smart-id-country-latvia" = "Läti";
 "smart-id-challenge-title" = "Allkirjasta Smart-IDga";
 "smart-id-sign-help-title" = "Veendu kontrollkoodi õigsuses ja sisesta nutiseadmes Smart-ID PIN2-kood";
+"nfc-title" = "ID-kaardiga allkirjastamiseks sisesta oma ID-kaardi ligipääsu number ja PIN2-kood";
+"nfc-can-title" = "ID-kaardi ligipääsu number";
+"nfc-device-no-support" = "See seade ei toeta NFC-d";
+"nfc-hold-near" = "Hoidke ID-kaarti telefoni lähedal";
+"nfc-multiple-cards" = "Rohkem kui 1 NFC märgis on tuvastatud, eemaldage kõik NFC-märgisega esemed ja proovige uuesti";
+"nfc-invalid-tag" = "Kehtetu NFC-märgis";
+"nfc-unable-connect" = "NFC-ega ei saa ühendust luua";
+"nfc-auth" = "Isikutuvastus ID-kaardiga";
+"nfc-reading-cert" = "Sertifikaadi lugemine";
+"nfc-sign-doc" = "Allkirjasta dokument";
+"nfc-sign-done" = "Allkiri lisatud";
+"nfc-auth-failed" = "Isikutuvastus ID-kaardiga ebaõnnestus";
+"nfc-sign-failed" = "Failed to sign document with ID-card";
+"nfc-pin-locked" = "Locked PIN";
 "role-and-address" = "Roll ja aadress";
 "role-and-address-title" = "Sisesta oma roll ja aadress";
 "role-and-address-role-title" = "Roll / resolutsioon";
@@ -254,6 +268,7 @@
 "sign-title-mobile-id" = "Mobiil-ID";
 "sign-title-smart-id" = "Smart-ID";
 "sign-title-id-card" = "ID-kaart";
+"sign-title-nfc" = "NFC";
 "card-reader-state-reader-not-found" = "Ühtegi kaardilugejat pole ühendatud";
 "card-reader-state-reader-restarted" = "Taaskäivitan kaardilugeja.";
 "card-reader-state-reader-process-failed" = "Andmete lugemine ebaõnnestus. Palun taasühenda kaardilugeja ja proovi uuesti.";
diff --git a/MoppApp/MoppApp/ru.lproj/Localizable.strings b/MoppApp/MoppApp/ru.lproj/Localizable.strings
index bc2f43506..c193f9761 100644
--- a/MoppApp/MoppApp/ru.lproj/Localizable.strings
+++ b/MoppApp/MoppApp/ru.lproj/Localizable.strings
@@ -231,6 +231,20 @@
 "smart-id-country-latvia" = "Латвия";
 "smart-id-challenge-title" = "Подписать с помощью приложения Smart-ID";
 "smart-id-sign-help-title" = "Убедитесь в правильности контрольного кода и введите PIN2-код для Smart-ID";
+"nfc-title" = "Введите номер доступа к карте и PIN2-код для подписи с помощью ID-карты";
+"nfc-can-title" = "Номер доступа к карте";
+"nfc-device-no-support" = "Это устройство не поддерживает NFC";
+"nfc-hold-near" = "Держите телефон рядом с ID-картой";
+"nfc-multiple-cards" = "Обнаружено более одной NFC-метки, пожалуйста, удалите все NFC-метки и повторите попытку";
+"nfc-invalid-tag" = "Недействительная NFC-метка";
+"nfc-unable-connect" = "Невозможно подключиться к NFC-метке";
+"nfc-auth" = "Идентификация личности по карте";
+"nfc-reading-cert" = "Считывание сертификата";
+"nfc-sign-doc" = "Подписать документ";
+"nfc-sign-done" = "Подпись добавлена";
+"nfc-auth-failed" = "Идентификация личности по карте не удалась";
+"nfc-sign-failed" = "Failed to sign document with ID-card";
+"nfc-pin-locked" = "Locked PIN";
 "role-and-address" = "Роль и адрес";
 "role-and-address-title" = "Введите свою роль и адрес";
 "role-and-address-role-title" = "Роль / pезолюция";
@@ -254,6 +268,7 @@
 "sign-title-mobile-id" = "Mobiil-ID";
 "sign-title-smart-id" = "Smart-ID";
 "sign-title-id-card" = "ID-карта";
+"sign-title-nfc" = "NFC";
 "card-reader-state-initial" = "Подключите считыватель карты и вставьте в него Вашу ID-карту.";
 "card-reader-state-reader-not-found" = "Считыватель карты не обнаружен";
 "card-reader-state-reader-restarted" = "Перезапуск устройства чтения карт.";
diff --git a/SkSigningLib/SkSigningLib/Models/SigningError.swift b/SkSigningLib/SkSigningLib/Models/SigningError.swift
index 7c0872b4f..b3a0e0bd7 100644
--- a/SkSigningLib/SkSigningLib/Models/SigningError.swift
+++ b/SkSigningLib/SkSigningLib/Models/SigningError.swift
@@ -26,7 +26,7 @@ import Foundation
 public enum SigningError: Error, Equatable {
 
     // MARK: General
-    case empty, cancelled
+    case empty, cancelled, nfcCancelled
     
     // MARK: General Errors
     case invalidURL, noResponseError, generalError, generalSignatureAddingError, invalidSSLCert
@@ -55,6 +55,8 @@ public enum SigningError: Error, Equatable {
             self = .empty
         case "cancelled":
             self = .cancelled
+        case "nfcCancelled":
+            self = .nfcCancelled
         case "invalidURL":
             self = .invalidURL
         case "noResponseError":
@@ -146,6 +148,8 @@ extension SigningError: LocalizedError {
             return NSLocalizedString("", comment: "")
         case .cancelled:
             return NSLocalizedString("Signing cancelled", comment: "")
+        case .nfcCancelled:
+            return NSLocalizedString("NFC signing cancelled", comment: "")
         case .parameterNameNull:
             return NSLocalizedString("mid-rest-error-incorrect-parameters", comment: "")
         case .invalidURL:
diff --git a/SkSigningLib/SkSigningLib/Models/SigningType.swift b/SkSigningLib/SkSigningLib/Models/SigningType.swift
index 9dcbcafe2..7502a5c75 100644
--- a/SkSigningLib/SkSigningLib/Models/SigningType.swift
+++ b/SkSigningLib/SkSigningLib/Models/SigningType.swift
@@ -27,4 +27,5 @@ public enum SigningType: String {
     case mobileId
     case smartId
     case idCard
+    case nfc
 }