diff --git a/client/QPCSC.cpp b/client/QPCSC.cpp
index 3f56cdbf1..97830c639 100644
--- a/client/QPCSC.cpp
+++ b/client/QPCSC.cpp
@@ -38,7 +38,7 @@ Q_LOGGING_CATEGORY(SCard,"QPCSC.SCard")
 
 static quint16 toUInt16(const QByteArray &data, int size)
 {
-	return size >= 2 ? quint16((quint16(data[size - 2]) << 8) | quint16(data[size - 1])) : 0;
+	return size >= 2 ? quint16((quint16(data[size - 2]) << 8) | quint8(data[size - 1])) : 0;
 }
 
 static QStringList stateToString(DWORD state)
@@ -58,31 +58,31 @@ static QStringList stateToString(DWORD state)
 	return result;
 }
 
-template<typename Func, typename... Args>
-static auto SCCall(const char *file, int line, const char *function, Func func, Args... args)
+template<auto Func, typename... Args>
+static auto SCCall(const char *file, int line, const char *function, Args... args)
 {
-	auto err = func(args...);
+	auto err = Func(args...);
 	if(SCard().isDebugEnabled())
 		QMessageLogger(file, line, function, SCard().categoryName()).debug()
 			<< function << Qt::hex << (unsigned long)err;
 	return err;
 }
-#define SC(API, ...) SCCall(__FILE__, __LINE__, "SCard"#API, SCard##API, __VA_ARGS__)
+#define SC(API, ...) SCCall<SCard##API>(__FILE__, __LINE__, "SCard"#API, __VA_ARGS__)
 
 QHash<DRIVER_FEATURES,quint32> QPCSCReader::Private::features()
 {
 	if(!featuresList.isEmpty())
 		return featuresList;
 	DWORD size = 0;
-	std::array<BYTE,256> feature{};
-	if(SC(Control, card, DWORD(CM_IOCTL_GET_FEATURE_REQUEST), nullptr, 0U, feature.data(), DWORD(feature.size()), &size))
+	std::array<PCSC_TLV_STRUCTURE,FEATURE_CCID_ESC_COMMAND> feature{};
+	if(SC(Control, card, DWORD(CM_IOCTL_GET_FEATURE_REQUEST), nullptr, 0U, feature.data(), DWORD(feature.size() * sizeof(PCSC_TLV_STRUCTURE)), &size))
 		return featuresList;
-	for(auto p = feature.cbegin(); std::distance(feature.cbegin(), p) < size; )
+	if(size % sizeof(PCSC_TLV_STRUCTURE))
+		return featuresList;
+	for(const auto &f: feature)
 	{
-		unsigned int tag = *p++, len = *p++, value = 0;
-		for(unsigned int i = 0; i < len; ++i)
-			value |= *p++ << 8 * i;
-		featuresList[DRIVER_FEATURES(tag)] = qFromBigEndian<quint32>(value);
+		if(f.tag)
+			featuresList[DRIVER_FEATURES(f.tag)] = qFromBigEndian<quint32>(f.value);
 	}
 	return featuresList;
 }
diff --git a/client/QSmartCard.cpp b/client/QSmartCard.cpp
index 16dcec7a3..83c91f3dd 100644
--- a/client/QSmartCard.cpp
+++ b/client/QSmartCard.cpp
@@ -383,7 +383,7 @@ QSmartCard::ErrorType QSmartCard::pinChange(QSmartCardData::PinType type, QWidge
 	else
 	{
 		SslCertificate cert = d->t.authCert();
-		title = cert.toString(cert.showCN() ? QStringLiteral("<b>CN,</b> serialNumber") : QStringLiteral("<b>GN SN,</b> serialNumber"));
+		title = cert.toString(cert.showCN() ? QStringLiteral("CN, serialNumber") : QStringLiteral("GN SN, serialNumber"));
 		textBody = tr("To change %1 on a PinPad reader the old %1 code has to be entered first and then the new %1 code twice.").arg(QSmartCardData::typeString(type));
 	}
 	return change(type, parent, newPin, oldPin, title, textBody);
@@ -407,7 +407,7 @@ QSmartCard::ErrorType QSmartCard::pinUnblock(QSmartCardData::PinType type, bool
 	else
 	{
 		SslCertificate cert = d->t.authCert();
-		title = cert.toString(cert.showCN() ? QStringLiteral("<b>CN,</b> serialNumber") : QStringLiteral("<b>GN SN,</b> serialNumber"));
+		title = cert.toString(cert.showCN() ? QStringLiteral("CN, serialNumber") : QStringLiteral("GN SN, serialNumber"));
 		textBody = isForgotPin ?
 			tr("To change %1 code with the PUK code on a PinPad reader the PUK code has to be entered first and then the %1 code twice.").arg(QSmartCardData::typeString(type)) :
 			tr("To unblock the %1 code on a PinPad reader the PUK code has to be entered first and then the %1 code twice.").arg(QSmartCardData::typeString(type));
diff --git a/client/dialogs/MobileDialog.ui b/client/dialogs/MobileDialog.ui
index 7e29d64bf..be923ca7e 100644
--- a/client/dialogs/MobileDialog.ui
+++ b/client/dialogs/MobileDialog.ui
@@ -3,7 +3,7 @@
  <class>MobileDialog</class>
  <widget class="QDialog" name="MobileDialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -41,6 +41,7 @@ padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
 color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -107,7 +108,7 @@ background-color: #2F70B6;
     <number>40</number>
    </property>
    <property name="sizeConstraint">
-    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+    <enum>QLayout::SetDefaultConstraint</enum>
    </property>
    <property name="leftMargin">
     <number>40</number>
@@ -130,13 +131,13 @@ background-color: #2F70B6;
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::TabFocus</enum>
+      <enum>Qt::TabFocus</enum>
      </property>
      <property name="text">
       <string>Enter your phone number to sign with mobile-ID</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignmentFlag::AlignCenter</set>
+      <set>Qt::AlignCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -184,6 +185,9 @@ background-color: #2F70B6;
            <height>20</height>
           </size>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
         </widget>
        </item>
       </layout>
@@ -224,6 +228,9 @@ background-color: #2F70B6;
            <height>20</height>
           </size>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
         </widget>
        </item>
       </layout>
@@ -264,7 +271,7 @@ background-color: #2F70B6;
      <item>
       <spacer name="buttonSpacer">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
diff --git a/client/dialogs/MobileProgress.cpp b/client/dialogs/MobileProgress.cpp
index aee2e5a3e..0bfa1fe5a 100644
--- a/client/dialogs/MobileProgress.cpp
+++ b/client/dialogs/MobileProgress.cpp
@@ -70,6 +70,7 @@ MobileProgress::MobileProgress(QWidget *parent)
 	d->setWindowFlags(Qt::Dialog|Qt::CustomizeWindowHint);
 	d->setupUi(d);
 	d->code->setBuddy(d->signProgressBar);
+	d->code->clear();
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
 const auto styleSheet = R"(QProgressBar {
 background-color: #d3d3d3;
diff --git a/client/dialogs/MobileProgress.ui b/client/dialogs/MobileProgress.ui
index a043f8025..5bc2a796a 100644
--- a/client/dialogs/MobileProgress.ui
+++ b/client/dialogs/MobileProgress.ui
@@ -3,7 +3,7 @@
  <class>MobileProgress</class>
  <widget class="QDialog" name="MobileProgress">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -35,6 +35,7 @@ padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
 color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -168,20 +169,20 @@ background-color: #2F70B6;
         <string>Control code:</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignCenter</set>
+        <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="code">
        <property name="focusPolicy">
-        <enum>Qt::FocusPolicy::TabFocus</enum>
+        <enum>Qt::TabFocus</enum>
        </property>
        <property name="text">
         <string notr="true">1234</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignCenter</set>
+        <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -191,7 +192,7 @@ background-color: #2F70B6;
         <string notr="true">Make sure control code matches with one in phone screen and enter mobile-ID PIN2-code.</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignCenter</set>
+        <set>Qt::AlignCenter</set>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -218,7 +219,7 @@ background-color: #2F70B6;
           <number>0</number>
          </property>
          <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
+          <set>Qt::AlignCenter</set>
          </property>
          <property name="textVisible">
           <bool>false</bool>
@@ -232,7 +233,7 @@ background-color: #2F70B6;
      </item>
     </layout>
    </item>
-   <item alignment="Qt::AlignmentFlag::AlignHCenter">
+   <item alignment="Qt::AlignHCenter">
     <widget class="QPushButton" name="cancel">
      <property name="cursor">
       <cursorShape>PointingHandCursor</cursorShape>
diff --git a/client/dialogs/PinPopup.ui b/client/dialogs/PinPopup.ui
index a4f254fe0..476e3d78c 100644
--- a/client/dialogs/PinPopup.ui
+++ b/client/dialogs/PinPopup.ui
@@ -3,7 +3,7 @@
  <class>PinPopup</class>
  <widget class="QDialog" name="PinPopup">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -38,6 +38,7 @@ padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
 color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -74,7 +75,7 @@ background-color: #2F70B6;
     <number>40</number>
    </property>
    <property name="sizeConstraint">
-    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+    <enum>QLayout::SetDefaultConstraint</enum>
    </property>
    <property name="leftMargin">
     <number>40</number>
@@ -97,13 +98,13 @@ background-color: #2F70B6;
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::TabFocus</enum>
+      <enum>Qt::TabFocus</enum>
      </property>
      <property name="text">
       <string notr="true">&lt;b&gt;Mari Maasikas,&lt;/b&gt; 48405050123</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignmentFlag::AlignCenter</set>
+      <set>Qt::AlignCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -118,13 +119,13 @@ background-color: #2F70B6;
      <item>
       <widget class="QLabel" name="text">
        <property name="focusPolicy">
-        <enum>Qt::FocusPolicy::TabFocus</enum>
+        <enum>Qt::TabFocus</enum>
        </property>
        <property name="text">
         <string>You need to use a personal identification certificate for the selected activity.</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignCenter</set>
+        <set>Qt::AlignCenter</set>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -149,7 +150,7 @@ background-color: #2F70B6;
        <item>
         <widget class="QLineEdit" name="pin">
          <property name="echoMode">
-          <enum>QLineEdit::EchoMode::Password</enum>
+          <enum>QLineEdit::Password</enum>
          </property>
         </widget>
        </item>
@@ -161,6 +162,9 @@ background-color: #2F70B6;
            <height>20</height>
           </size>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
         </widget>
        </item>
       </layout>
@@ -194,7 +198,7 @@ background-color: #2F70B6;
      <item>
       <spacer name="buttonSpacer">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
diff --git a/client/dialogs/PinUnblock.cpp b/client/dialogs/PinUnblock.cpp
index af9780643..9fc413e8c 100644
--- a/client/dialogs/PinUnblock.cpp
+++ b/client/dialogs/PinUnblock.cpp
@@ -45,18 +45,17 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 	new Overlay(this);
 
 	auto pattern = [](QSmartCardData::PinType type) {
-		return QStringLiteral("^\\d{%1,12}$").arg(QSmartCardData::minPinLen(type));
+		return QRegularExpression(QStringLiteral("^\\d{%1,12}$").arg(QSmartCardData::minPinLen(type)));
 	};
 
 	QRegularExpression regexpValidateCode;
-	QRegularExpression regexpNewCode;
-	regexpNewCode.setPattern(pattern(type));
+	QRegularExpression regexpNewCode = pattern(type);
 	switch(mode)
 	{
 	case PinUnblock::UnBlockPinWithPuk:
 		ui->label->setText(tr("%1 unblocking").arg(QSmartCardData::typeString(type)));
 		ui->change->setText(tr("Unblock"));
-		regexpValidateCode.setPattern(pattern(QSmartCardData::PukType));
+		regexpValidateCode = pattern(QSmartCardData::PukType);
 		ui->line1_text->setText(tr("To unblock the certificate you have to enter the PUK code."));
 		ui->line2_text->setText(tr("You can find your PUK code inside the ID-card codes envelope."));
 		ui->line3_text->setText(tr("If you have forgotten the PUK code for your ID card, please visit "
@@ -65,7 +64,7 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 		break;
 	case PinUnblock::ChangePinWithPuk:
 		ui->label->setText(tr("%1 code change").arg(QSmartCardData::typeString(type)));
-		regexpValidateCode.setPattern(pattern(QSmartCardData::PukType));
+		regexpValidateCode = pattern(QSmartCardData::PukType);
 		ui->line1_text->setText(type == QSmartCardData::Pin2Type
 									? tr("PIN2 code is used to digitally sign documents.")
 									: tr("PIN1 code is used for confirming the identity of a person."));
@@ -75,7 +74,7 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 	case PinUnblock::PinChange:
 		ui->label->setText(tr("%1 code change").arg(QSmartCardData::typeString(type)));
 		ui->labelPuk->setText(tr("Valid %1 code").arg(QSmartCardData::typeString(type)));
-		regexpValidateCode.setPattern(pattern(type));
+		regexpValidateCode = pattern(type);
 		if(type == QSmartCardData::PukType)
 		{
 			ui->line1_text->setText(tr("PUK code is used for unblocking the certificates, when PIN1 or PIN2 has been entered 3 times incorrectly."));
@@ -100,8 +99,14 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 	ui->repeat->setValidator(new QRegularExpressionValidator(regexpNewCode, ui->repeat));
 	ui->puk->setValidator(new QRegularExpressionValidator(regexpValidateCode, ui->puk));
 
+	auto setError = [](QLineEdit *input, QLabel *error, const QString &msg) {
+		input->setStyleSheet(msg.isEmpty() ? QString() : QStringLiteral("border-color: #BE7884"));
+		error->setFocusPolicy(msg.isEmpty() ? Qt::NoFocus : Qt::TabFocus);
+		error->setText(msg);
+		error->setHidden(msg.isEmpty());
+	};
 	if(leftAttempts < 3)
-		ui->errorPuk->setText(mode == PinUnblock::PinChange ?
+		setError(ui->puk, ui->errorPuk, mode == PinUnblock::PinChange ?
 			tr("Remaining attempts: %1").arg(leftAttempts) :
 			tr("PUK remaining attempts: %1").arg(leftAttempts));
 
@@ -113,12 +118,6 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 		if(auto *bullet = findChild<QLabel*>(QStringLiteral("line%1_bullet").arg(i)))
 			bullet->setHidden(isHidden);
 	}
-	auto setError = [](QLineEdit *input, QLabel *error, const QString &msg) {
-		input->setStyleSheet(msg.isEmpty() ? QString() : QStringLiteral("border-color: #BE7884"));
-		error->setFocusPolicy(msg.isEmpty() ? Qt::NoFocus : Qt::TabFocus);
-		error->setText(msg);
-		error->setHidden(msg.isEmpty());
-	};
 	connect(ui->cancel, &QPushButton::clicked, this, &PinUnblock::reject);
 	connect(this, &PinUnblock::finished, this, &PinUnblock::close);
 	connect(ui->pin, &QLineEdit::returnPressed, ui->change, &QPushButton::click);
diff --git a/client/dialogs/PinUnblock.ui b/client/dialogs/PinUnblock.ui
index a59f540a7..acf436360 100644
--- a/client/dialogs/PinUnblock.ui
+++ b/client/dialogs/PinUnblock.ui
@@ -3,14 +3,14 @@
  <class>PinUnblock</class>
  <widget class="QDialog" name="PinUnblock">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>430</width>
-    <height>570</height>
+    <height>588</height>
    </rect>
   </property>
   <property name="styleSheet">
@@ -38,6 +38,7 @@ padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
 color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -74,7 +75,7 @@ background-color: #2F70B6;
     <number>40</number>
    </property>
    <property name="sizeConstraint">
-    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+    <enum>QLayout::SetFixedSize</enum>
    </property>
    <property name="leftMargin">
     <number>40</number>
@@ -97,13 +98,13 @@ background-color: #2F70B6;
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::TabFocus</enum>
+      <enum>Qt::TabFocus</enum>
      </property>
      <property name="text">
       <string notr="true">%1 code change</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignmentFlag::AlignCenter</set>
+      <set>Qt::AlignCenter</set>
      </property>
     </widget>
    </item>
@@ -135,20 +136,20 @@ background-color: #2F70B6;
           <string notr="true">&amp;bull;</string>
          </property>
          <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
+          <enum>Qt::RichText</enum>
          </property>
          <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QLabel" name="line1_text">
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
+          <enum>Qt::RichText</enum>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -176,20 +177,20 @@ background-color: #2F70B6;
           <string notr="true">&amp;bull;</string>
          </property>
          <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
+          <enum>Qt::RichText</enum>
          </property>
          <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QLabel" name="line2_text">
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
+          <enum>Qt::RichText</enum>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -217,20 +218,20 @@ background-color: #2F70B6;
           <string notr="true">&amp;bull;</string>
          </property>
          <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
+          <enum>Qt::RichText</enum>
          </property>
          <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="QLabel" name="line3_text">
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="textFormat">
-          <enum>Qt::TextFormat::RichText</enum>
+          <enum>Qt::RichText</enum>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -260,12 +261,22 @@ background-color: #2F70B6;
        <item>
         <widget class="QLineEdit" name="puk">
          <property name="echoMode">
-          <enum>QLineEdit::EchoMode::Password</enum>
+          <enum>QLineEdit::Password</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="errorPuk"/>
+        <widget class="QLabel" name="errorPuk">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
+        </widget>
        </item>
       </layout>
      </item>
@@ -287,12 +298,22 @@ background-color: #2F70B6;
        <item>
         <widget class="QLineEdit" name="pin">
          <property name="echoMode">
-          <enum>QLineEdit::EchoMode::Password</enum>
+          <enum>QLineEdit::Password</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="errorPin"/>
+        <widget class="QLabel" name="errorPin">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
+        </widget>
        </item>
       </layout>
      </item>
@@ -314,12 +335,22 @@ background-color: #2F70B6;
        <item>
         <widget class="QLineEdit" name="repeat">
          <property name="echoMode">
-          <enum>QLineEdit::EchoMode::Password</enum>
+          <enum>QLineEdit::Password</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="errorRepeat"/>
+        <widget class="QLabel" name="errorRepeat">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
+        </widget>
        </item>
       </layout>
      </item>
@@ -346,7 +377,7 @@ background-color: #2F70B6;
      <item>
       <spacer name="buttonSpacer">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -362,7 +393,7 @@ background-color: #2F70B6;
         <cursorShape>PointingHandCursor</cursorShape>
        </property>
        <property name="text">
-        <string>Unblock</string>
+        <string>Change</string>
        </property>
        <property name="default">
         <bool>true</bool>
diff --git a/client/dialogs/RoleAddressDialog.ui b/client/dialogs/RoleAddressDialog.ui
index 4d32b2331..ef2b08ee1 100644
--- a/client/dialogs/RoleAddressDialog.ui
+++ b/client/dialogs/RoleAddressDialog.ui
@@ -3,7 +3,7 @@
  <class>RoleAddressDialog</class>
  <widget class="QDialog" name="RoleAddressDialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -38,6 +38,7 @@ padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
 color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -74,7 +75,7 @@ background-color: #2F70B6;
     <number>40</number>
    </property>
    <property name="sizeConstraint">
-    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+    <enum>QLayout::SetFixedSize</enum>
    </property>
    <property name="leftMargin">
     <number>40</number>
@@ -97,13 +98,13 @@ background-color: #2F70B6;
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::TabFocus</enum>
+      <enum>Qt::TabFocus</enum>
      </property>
      <property name="text">
       <string>Enter your role and address info</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignmentFlag::AlignCenter</set>
+      <set>Qt::AlignCenter</set>
      </property>
     </widget>
    </item>
@@ -232,7 +233,7 @@ background-color: #2F70B6;
      <item>
       <spacer name="buttonSpacer">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
diff --git a/client/dialogs/SmartIDDialog.ui b/client/dialogs/SmartIDDialog.ui
index 00691b4d4..9ab395d00 100644
--- a/client/dialogs/SmartIDDialog.ui
+++ b/client/dialogs/SmartIDDialog.ui
@@ -3,7 +3,7 @@
  <class>SmartIDDialog</class>
  <widget class="QDialog" name="SmartIDDialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -41,6 +41,7 @@ padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
 color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -143,7 +144,7 @@ background-color: #2F70B6;
     <number>40</number>
    </property>
    <property name="sizeConstraint">
-    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+    <enum>QLayout::SetFixedSize</enum>
    </property>
    <property name="leftMargin">
     <number>40</number>
@@ -166,13 +167,13 @@ background-color: #2F70B6;
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::TabFocus</enum>
+      <enum>Qt::TabFocus</enum>
      </property>
      <property name="text">
       <string>Enter your personal code to sign with Smart-ID</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignmentFlag::AlignCenter</set>
+      <set>Qt::AlignCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -262,6 +263,9 @@ background-color: #2F70B6;
            <height>20</height>
           </size>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
         </widget>
        </item>
       </layout>
@@ -302,7 +306,7 @@ background-color: #2F70B6;
      <item>
       <spacer name="buttonSpacer">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
diff --git a/client/dialogs/SmartIDProgress.cpp b/client/dialogs/SmartIDProgress.cpp
index da2070fa8..c0e7dd2e1 100644
--- a/client/dialogs/SmartIDProgress.cpp
+++ b/client/dialogs/SmartIDProgress.cpp
@@ -83,6 +83,7 @@ SmartIDProgress::SmartIDProgress(QWidget *parent)
 	d->setupUi(d);
 	d->signProgressBar->setMaximum(100);
 	d->code->setBuddy(d->signProgressBar);
+	d->code->clear();
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
 const auto styleSheet = R"(QProgressBar {
 background-color: #d3d3d3;;
diff --git a/client/dialogs/WaitDialog.cpp b/client/dialogs/WaitDialog.cpp
index ffbcadda4..b8423e280 100644
--- a/client/dialogs/WaitDialog.cpp
+++ b/client/dialogs/WaitDialog.cpp
@@ -37,6 +37,7 @@ WaitDialog::WaitDialog(QWidget *parent)
 	ui->setupUi(this);
 	ui->movie->load(QStringLiteral(":/images/wait.svg"));
 	ui->label->setFont(Styles::font(Styles::Condensed, 24));
+	ui->label->setFocusPolicy(Qt::TabFocus);
 	move(parent->geometry().center() - geometry().center());
 	timer.setSingleShot(true);
 	connect(&timer, &QTimer::timeout, this, &WaitDialog::show);
diff --git a/client/translations/en.ts b/client/translations/en.ts
index a349a92c3..056a15907 100644
--- a/client/translations/en.ts
+++ b/client/translations/en.ts
@@ -2066,6 +2066,10 @@ ID-CARD</translation>
         <source>Current PUK code</source>
         <translation>Current PUK code</translation>
     </message>
+    <message>
+        <source>Change</source>
+        <translation>Change</translation>
+    </message>
 </context>
 <context>
     <name>PrintSheet</name>
diff --git a/client/translations/et.ts b/client/translations/et.ts
index 91ef7c91f..8a37c76aa 100644
--- a/client/translations/et.ts
+++ b/client/translations/et.ts
@@ -2066,6 +2066,10 @@ ID-KAARDIGA</translation>
         <source>Current PUK code</source>
         <translation>Kehtiv PUK-kood</translation>
     </message>
+    <message>
+        <source>Change</source>
+        <translation>Muuda</translation>
+    </message>
 </context>
 <context>
     <name>PrintSheet</name>
diff --git a/client/translations/ru.ts b/client/translations/ru.ts
index d8631c195..99f41bc65 100644
--- a/client/translations/ru.ts
+++ b/client/translations/ru.ts
@@ -2067,6 +2067,10 @@ ID-КАРТОЙ</translation>
         <source>Current PUK code</source>
         <translation>Действующий PUK-код</translation>
     </message>
+    <message>
+        <source>Change</source>
+        <translation>Поменять</translation>
+    </message>
 </context>
 <context>
     <name>PrintSheet</name>