diff --git a/CMakeLists.txt b/CMakeLists.txt
index e17f3196e..f314a5502 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include( GNUInstallDirs )
 include( VersionInfo )
 
 find_package( PKCS11 )
-find_package( LibDigiDocpp 3.14.8 REQUIRED )
+find_package(LibDigiDocpp 3.14.11 REQUIRED)
 find_package( LDAP REQUIRED )
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.9.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools)
diff --git a/client/Application.cpp b/client/Application.cpp
index a41ba9926..2baa26611 100644
--- a/client/Application.cpp
+++ b/client/Application.cpp
@@ -194,6 +194,17 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 	{ SettingsDialog::setValueEx(QStringLiteral("TSA-URL"), QString::fromStdString(url)); }
 
 	std::string TSLUrl() const final { return valueSystemScope(QStringLiteral("TSL-URL"), digidoc::XmlConfCurrent::TSLUrl()); }
+	std::vector<digidoc::X509Cert> TSLCerts() const final
+	{
+		std::vector<digidoc::X509Cert> tslcerts;
+		for(const QJsonValue &val: obj.value(QStringLiteral("TSL-CERTS")).toArray())
+		{
+			QByteArray cert = QByteArray::fromBase64(val.toString().toLatin1());
+			tslcerts.emplace_back((const unsigned char*)cert.constData(), size_t(cert.size()));
+		}
+		return tslcerts.empty() ? digidoc::XmlConfCurrent::TSLCerts() : tslcerts;
+	}
+
 	digidoc::X509Cert verifyServiceCert() const final
 	{
 		QByteArray cert = QByteArray::fromBase64(obj.value(QStringLiteral("SIVA-CERT")).toString().toLatin1());
@@ -212,17 +223,15 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 		}
 		return list;
 	}
-	std::string verifyServiceUri() const final { return valueSystemScope(QStringLiteral("SIVA-URL"), digidoc::XmlConfCurrent::verifyServiceUri()); }
-	std::vector<digidoc::X509Cert> TSLCerts() const final
+	std::string verifyServiceUri() const final
 	{
-		std::vector<digidoc::X509Cert> tslcerts;
-		for(const QJsonValue &val: obj.value(QStringLiteral("TSL-CERTS")).toArray())
-		{
-			QByteArray cert = QByteArray::fromBase64(val.toString().toLatin1());
-			tslcerts.emplace_back((const unsigned char*)cert.constData(), size_t(cert.size()));
-		}
-		return tslcerts.empty() ? digidoc::XmlConfCurrent::TSLCerts() : tslcerts;
+		if(s.value(QStringLiteral("SIVA-URL-CUSTOM"), s.contains(QStringLiteral("SIVA-URL"))).toBool())
+			return valueUserScope(QStringLiteral("SIVA-URL"), digidoc::XmlConfCurrent::verifyServiceUri());
+		return valueSystemScope(QStringLiteral("SIVA-URL"), digidoc::XmlConfCurrent::verifyServiceUri());
 	}
+	void setVerifyServiceUri(const std::string &url) final
+	{ SettingsDialog::setValueEx(QStringLiteral("SIVA-URL"), QString::fromStdString(url), QString()); }
+
 	std::string ocsp(const std::string &issuer) const final
 	{
 		QJsonObject ocspissuer = obj.value(QStringLiteral("OCSP-URL-ISSUER")).toObject();
@@ -1047,7 +1056,7 @@ void Application::setConfValue( ConfParameter parameter, const QVariant &value )
 		case PKCS12Disable: i->setPKCS12Disable( value.toBool() ); break;
 		case TSLOnlineDigest: i->setTSLOnlineDigest( value.toBool() ); break;
 		case TSAUrl: i->setTSUrl(v.isEmpty()? std::string() : v.constData()); break;
-		case SiVaUrl:
+		case SiVaUrl: i->setVerifyServiceUri(v.isEmpty()? std::string() : v.constData()); break;
 		case TSLCerts:
 		case TSLUrl:
 		case TSLCache: break;
diff --git a/client/dialogs/SettingsDialog.cpp b/client/dialogs/SettingsDialog.cpp
index 6c36f04f9..7ea88a463 100644
--- a/client/dialogs/SettingsDialog.cpp
+++ b/client/dialogs/SettingsDialog.cpp
@@ -84,6 +84,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 	ui->lblMenuSettings->setFont(headerFont);
 	ui->btnMenuGeneral->setFont(condensed12);
 	ui->btnMenuCertificate->setFont(condensed12);
+	ui->btnMenuValidation->setFont(condensed12);
 	ui->btnMenuProxy->setFont(condensed12);
 	ui->btnMenuDiagnostics->setFont(condensed12);
 	ui->btnMenuInfo->setFont(condensed12);
@@ -130,6 +131,21 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 	ui->helpTimeStamp->installEventFilter(new ButtonHoverFilter(QStringLiteral(":/images/icon_Abi.svg"), QStringLiteral(":/images/icon_Abi_hover.svg"), this));
 	ui->helpMID->installEventFilter(new ButtonHoverFilter(QStringLiteral(":/images/icon_Abi.svg"), QStringLiteral(":/images/icon_Abi_hover.svg"), this));
 
+	// pageValidation
+	ui->lblSiVa->setFont(headerFont);
+	ui->lblSiVaCert->setFont(regularFont);
+	ui->txtSiVa->setFont(regularFont);
+	ui->txtSiVaCert->setFont(regularFont);
+	ui->rdSiVaDefault->setFont(regularFont);
+	ui->rdSiVaCustom->setFont(regularFont);
+	ui->btInstallSiVaCert->setFont(condensed12);
+	ui->btShowSiVaCert->setFont(condensed12);
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+	ui->btInstallSiVaCert->setStyleSheet("background-color: #d3d3d3");
+	ui->btShowSiVaCert->setStyleSheet("background-color: #d3d3d3");
+#endif
+	ui->helpSiVa->installEventFilter(new ButtonHoverFilter(QStringLiteral(":/images/icon_Abi.svg"), QStringLiteral(":/images/icon_Abi_hover.svg"), this));
+
 	// pageProxy
 	ui->rdProxyNone->setFont(regularFont);
 	ui->rdProxySystem->setFont(regularFont);
@@ -246,7 +262,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 #endif
 
 	ui->pageGroup->setId(ui->btnMenuGeneral, GeneralSettings);
-	ui->pageGroup->setId(ui->btnMenuCertificate, AccessCertSettings);
+	ui->pageGroup->setId(ui->btnMenuCertificate, SigningSettings);
+	ui->pageGroup->setId(ui->btnMenuValidation, ValidationSettings);
 	ui->pageGroup->setId(ui->btnMenuProxy, NetworkSettings);
 	ui->pageGroup->setId(ui->btnMenuDiagnostics, DiagnosticsSettings);
 	ui->pageGroup->setId(ui->btnMenuInfo, LicenseSettings);
@@ -269,6 +286,14 @@ SettingsDialog::~SettingsDialog()
 	delete ui;
 }
 
+QString SettingsDialog::certInfo(const SslCertificate &c)
+{
+	return tr("Issued to: %1<br />Valid to: %2 %3").arg(
+		c.subjectInfo(QSslCertificate::CommonName),
+		c.expiryDate().toString(QStringLiteral("dd.MM.yyyy")),
+		!c.isValid() ? QStringLiteral("<font color='red'>(%1)</font>").arg(tr("expired")) : QString());
+}
+
 void SettingsDialog::checkConnection()
 {
 	QApplication::setOverrideCursor( Qt::WaitCursor );
@@ -377,7 +402,7 @@ void SettingsDialog::initFunctionality()
 	ui->chkProxyEnableForSSL->setDisabled((s.value(QStringLiteral("ProxyConfig"), 0).toInt() != 2));
 	updateProxy();
 
-	// pageServices
+	// pageServices - Access Cert
 	updateCert();
 	connect(ui->btShowCertificate, &QPushButton::clicked, this, [this] {
 		CertificateDetails::showCertificate(SslCertificate(AccessCert::cert()), this);
@@ -387,7 +412,11 @@ void SettingsDialog::initFunctionality()
 	connect(ui->chkIgnoreAccessCert, &QCheckBox::toggled, this, [](bool checked) {
 		Application::setConfValue(Application::PKCS12Disable, checked);
 	});
+	connect(ui->helpRevocation, &QToolButton::clicked, this, []{
+		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/access-certificate-what-is-it/"));
+	});
 
+	// pageServices - TimeStamp
 	connect(ui->rdTimeStampCustom, &QRadioButton::toggled, ui->txtTimeStamp, [=](bool checked) {
 		ui->txtTimeStamp->setEnabled(checked);
 		setValueEx(QStringLiteral("TSA-URL-CUSTOM"), checked, QSettings().contains(QStringLiteral("TSA-URL")));
@@ -401,6 +430,11 @@ void SettingsDialog::initFunctionality()
 	connect(ui->txtTimeStamp, &QLineEdit::textChanged, this, [](const QString &url) {
 		qApp->setConfValue(Application::TSAUrl, url);
 	});
+	connect(ui->helpTimeStamp, &QToolButton::clicked, this, []{
+		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/for-organisations-that-sign-large-quantities-of-documents-using-digidoc4-client/"));
+	});
+
+	// pageServices - MID
 	connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [=](bool checked) {
 		ui->txtMIDUUID->setEnabled(checked);
 		setValueEx(QStringLiteral("MIDUUID-CUSTOM"), checked, QSettings().contains(QStringLiteral("MIDUUID")));
@@ -412,16 +446,52 @@ void SettingsDialog::initFunctionality()
 		setValueEx(QStringLiteral("MIDUUID"), text);
 		setValueEx(QStringLiteral("SIDUUID"), text);
 	});
-	connect(ui->helpRevocation, &QToolButton::clicked, this, []{
-		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/access-certificate-what-is-it/"));
-	});
-	connect(ui->helpTimeStamp, &QToolButton::clicked, this, []{
-		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/for-organisations-that-sign-large-quantities-of-documents-using-digidoc4-client/"));
-	});
 	connect(ui->helpMID, &QToolButton::clicked, this, []{
 		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/for-organisations-that-sign-large-quantities-of-documents-using-digidoc4-client/"));
 	});
 
+	// pageValidation - SiVa
+	connect(ui->rdSiVaCustom, &QRadioButton::toggled, ui->txtSiVa, [this](bool checked) {
+		ui->txtSiVa->setEnabled(checked);
+		ui->wgtSiVaCert->setVisible(checked);
+		setValueEx(QStringLiteral("SIVA-URL-CUSTOM"), checked, QSettings().contains(QStringLiteral("SIVA-URL")));
+	});
+	ui->rdSiVaCustom->setChecked(s.value(QStringLiteral("SIVA-URL-CUSTOM"), s.contains(QStringLiteral("SIVA-URL"))).toBool());
+	ui->wgtSiVaCert->setVisible(ui->rdSiVaCustom->isChecked());
+#ifdef CONFIG_URL
+	ui->txtSiVa->setPlaceholderText(qApp->conf()->object().value(QStringLiteral("SIVA-URL")).toString());
+#endif
+	QString SIVA_URL = s.value(QStringLiteral("SIVA-URL"), qApp->confValue(Application::SiVaUrl)).toString();
+	ui->txtSiVa->setText(ui->txtSiVa->placeholderText() == SIVA_URL ? QString() : SIVA_URL);
+	connect(ui->txtSiVa, &QLineEdit::textChanged, this, [this](const QString &url) {
+		qApp->setConfValue(Application::SiVaUrl, url);
+		if(url.isEmpty())
+		{
+			QSettings().remove(QStringLiteral("SIVA-CERT"));
+			updateSiVaCert(QSslCertificate());
+		}
+	});
+	connect(ui->helpSiVa, &QToolButton::clicked, this, []{
+		QDesktopServices::openUrl(tr("https://www.id.ee/en/article/configuring-the-siva-validation-service-in-the-digidoc4-client/"));
+	});
+	connect(ui->btInstallSiVaCert, &QPushButton::clicked, this, [this] {
+		QFile file(FileDialog::getOpenFileName(this, tr("Select SiVa server certificate"), {},
+			QStringLiteral("%1 (*.crt *.cer *.pem)")).arg(tr("Digital Signature Validation Service SiVa SSL certificate")));
+		if(!file.open(QFile::ReadOnly))
+			return;
+		QSslCertificate cert(&file, QSsl::Pem);
+		if(cert.isNull())
+		{
+			file.seek(0);
+			cert = QSslCertificate(&file, QSsl::Der);
+		}
+		if(cert.isNull())
+			return;
+		QSettings().setValue(QStringLiteral("SIVA-CERT"), cert.toDer().toBase64());
+		updateSiVaCert(cert);
+	});
+	updateSiVaCert(QSslCertificate(QByteArray::fromBase64(s.value(QStringLiteral("SIVA-CERT")).toByteArray()), QSsl::Der));
+
 	// pageDiagnostics
 	ui->chkLibdigidocppDebug->setChecked(s.value(QStringLiteral("LibdigidocppDebug"), false).toBool());
 	connect(ui->chkLibdigidocppDebug, &QCheckBox::toggled, this, [this](bool checked) {
@@ -453,21 +523,25 @@ void SettingsDialog::initFunctionality()
 void SettingsDialog::updateCert()
 {
 	QSslCertificate c = AccessCert::cert();
-	if( !c.isNull() )
-	{
-		ui->txtAccessCert->setText(
-			tr("Issued to: %1<br />Valid to: %2 %3").arg(
-				CertificateDetails::decodeCN(SslCertificate(c).subjectInfo(QSslCertificate::CommonName)),
-				c.expiryDate().toString(QStringLiteral("dd.MM.yyyy")),
-				!SslCertificate(c).isValid() ? "<font color='red'>(" + tr("expired") + ")</font>" : QString()));
-	}
+	if(!c.isNull())
+		ui->txtAccessCert->setText(certInfo(c));
 	else
-	{
-		ui->txtAccessCert->setText( 
-			"<b>" + tr("Server access certificate is not installed.") + "</b>" );
-	}
-	ui->btShowCertificate->setEnabled(!c.isNull());
-	ui->btShowCertificate->setProperty("cert", QVariant::fromValue(c));
+		ui->txtAccessCert->setText(QStringLiteral("<b>%1</b>")
+			.arg(tr("Server access certificate is not installed.")));
+	ui->btShowCertificate->setDisabled(c.isNull());
+}
+
+void SettingsDialog::updateSiVaCert(const QSslCertificate &c)
+{
+	disconnect(ui->btShowSiVaCert, &QPushButton::clicked, nullptr, nullptr);
+	ui->btShowSiVaCert->setHidden(c.isNull());
+	ui->txtSiVaCert->setHidden(c.isNull());
+	if(c.isNull())
+		return;
+	ui->txtSiVaCert->setCert(c);
+	connect(ui->btShowSiVaCert, &QPushButton::clicked, this, [this, c] {
+		CertificateDetails::showCertificate(c, this);
+	});
 }
 
 void SettingsDialog::selectLanguage()
@@ -608,6 +682,7 @@ void SettingsDialog::useDefaultSettings()
 	AccessCert().remove();
 	updateCert();
 	ui->rdTimeStampDefault->setChecked(true);
+	ui->rdSiVaDefault->setChecked(true);
 	ui->rdMIDUUIDDefault->setChecked(true);
 }
 
@@ -620,7 +695,7 @@ void SettingsDialog::changePage(QAbstractButton *button)
 {
 	button->setChecked(true);
 	ui->stackedWidget->setCurrentIndex(ui->pageGroup->id(button));
-	ui->btnNavUseByDefault->setVisible(button == ui->btnMenuCertificate);
+	ui->btnNavUseByDefault->setVisible(button == ui->btnMenuCertificate || button == ui->btnMenuValidation);
 	ui->btnFirstRun->setVisible(button == ui->btnMenuGeneral);
 	ui->btnRefreshConfig->setVisible(button == ui->btnMenuGeneral);
 	ui->btnCheckConnection->setVisible(button == ui->btnMenuProxy);
@@ -653,3 +728,18 @@ void SettingsDialog::saveFile(const QString &name, const QByteArray &content)
 	if(!f.open(QIODevice::WriteOnly|QIODevice::Text) || !f.write(content))
 		WarningDialog::show(this, tr("Failed write to file!"));
 }
+
+
+
+void CertLabel::setCert(const QSslCertificate &cert)
+{
+	setText(SettingsDialog::certInfo(cert));
+	setProperty("cert", QVariant::fromValue(cert));
+}
+
+bool CertLabel::event(QEvent *event)
+{
+	if(event->type() == QEvent::LanguageChange)
+		setText(SettingsDialog::certInfo(property("cert").value<QSslCertificate>()));
+	return QLabel::event(event);
+}
diff --git a/client/dialogs/SettingsDialog.h b/client/dialogs/SettingsDialog.h
index 082c23459..426134bd1 100644
--- a/client/dialogs/SettingsDialog.h
+++ b/client/dialogs/SettingsDialog.h
@@ -21,6 +21,7 @@
 
 #include <QDialog>
 
+#include <QLabel>
 #include <QVariant>
 
 namespace digidoc { class Conf; }
@@ -30,6 +31,8 @@ class SettingsDialog;
 }
 
 class QAbstractButton;
+class QSslCertificate;
+class SslCertificate;
 
 class SettingsDialog final: public QDialog
 {
@@ -38,7 +41,8 @@ class SettingsDialog final: public QDialog
 public:
 	enum {
 		GeneralSettings,
-		AccessCertSettings,
+		SigningSettings,
+		ValidationSettings,
 		NetworkSettings,
 		DiagnosticsSettings,
 		LicenseSettings
@@ -49,6 +53,7 @@ class SettingsDialog final: public QDialog
 	~SettingsDialog() final;
 
 	void showPage(int page);
+	static QString certInfo(const SslCertificate &c);
 	static void loadProxy( const digidoc::Conf *conf );
 	static void setValueEx(const QString &key, const QVariant &value, const QVariant &def = {});
 
@@ -68,6 +73,7 @@ class SettingsDialog final: public QDialog
 	void selectLanguage();
 	void setProxyEnabled();
 	void updateCert();
+	void updateSiVaCert(const QSslCertificate &c);
 	void updateProxy();
 	void updateVersion();
 	void updateDiagnostics();
@@ -75,3 +81,12 @@ class SettingsDialog final: public QDialog
 
 	Ui::SettingsDialog *ui;
 };
+
+class CertLabel final: public QLabel {
+	Q_OBJECT
+public:
+	using QLabel::QLabel;
+	void setCert(const QSslCertificate &cert);
+private:
+	bool event(QEvent *event) final;
+};
diff --git a/client/dialogs/SettingsDialog.ui b/client/dialogs/SettingsDialog.ui
index a7bf38556..1ead127db 100644
--- a/client/dialogs/SettingsDialog.ui
+++ b/client/dialogs/SettingsDialog.ui
@@ -152,7 +152,7 @@ QRadioButton:hover {
          <string extracomment="accessible">Services</string>
         </property>
         <property name="text">
-         <string>SERVICES</string>
+         <string>SIGNING SERVICES</string>
         </property>
         <property name="checkable">
          <bool>true</bool>
@@ -162,6 +162,16 @@ QRadioButton:hover {
         </attribute>
        </widget>
       </item>
+      <item>
+       <widget class="QRadioButton" name="btnMenuValidation">
+        <property name="text">
+         <string>VALIDATION SERVICES</string>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">pageGroup</string>
+        </attribute>
+       </widget>
+      </item>
       <item>
        <widget class="QRadioButton" name="btnMenuProxy">
         <property name="accessibleName">
@@ -235,9 +245,12 @@ QRadioButton:hover {
       </font>
      </property>
      <property name="styleSheet">
-      <string notr="true">#pageGeneral, #pageServices, #pageProxy, #pageDiagnostics, #pageInfo {
+      <string notr="true">#pageGeneral, #pageServices, #pageValidation, #pageProxy, #pageDiagnostics, #pageInfo {
 	background-color: #ffffff;
 }
+#lblGeneralLang, #lblRevocation, #lblTimeStamp, #lblMID, #lblSiVa {
+    color: #041E42;
+}
 QLineEdit {
     border: 1px solid #DEE4E9;
     border-radius: 2px;
@@ -294,9 +307,6 @@ QRadioButton::indicator::checked {
          <property name="focusPolicy">
           <enum>Qt::TabFocus</enum>
          </property>
-         <property name="styleSheet">
-          <string notr="true">color: #041E42;</string>
-         </property>
          <property name="text">
           <string>Language</string>
          </property>
@@ -472,9 +482,10 @@ QRadioButton::indicator::checked {
       <property name="styleSheet">
        <string notr="true">QToolButton { border: none; }
 QPushButton {
-	padding-bottom:1px; 
+	padding: 1px;
 	text-align: middle;
 	min-height: 30px;
+	min-width: 150px;
 }</string>
       </property>
       <layout class="QVBoxLayout" name="pageServicesLayout">
@@ -500,9 +511,6 @@ QPushButton {
            <property name="focusPolicy">
             <enum>Qt::TabFocus</enum>
            </property>
-           <property name="styleSheet">
-            <string notr="true">color: #041E42;</string>
-           </property>
            <property name="text">
             <string>Access to validity confirmation service</string>
            </property>
@@ -578,12 +586,6 @@ QPushButton {
         <layout class="QHBoxLayout" name="accessCertButtonsLayout">
          <item>
           <widget class="QPushButton" name="btInstallManually">
-           <property name="minimumSize">
-            <size>
-             <width>150</width>
-             <height>31</height>
-            </size>
-           </property>
            <property name="cursor">
             <cursorShape>PointingHandCursor</cursorShape>
            </property>
@@ -597,17 +599,11 @@ QPushButton {
          </item>
          <item>
           <widget class="QPushButton" name="btShowCertificate">
-           <property name="minimumSize">
-            <size>
-             <width>150</width>
-             <height>31</height>
-            </size>
-           </property>
            <property name="cursor">
             <cursorShape>PointingHandCursor</cursorShape>
            </property>
            <property name="text">
-            <string>SHOW CERTIFICATE</string>
+            <string comment="accessCert">SHOW CERTIFICATE</string>
            </property>
            <property name="autoDefault">
             <bool>false</bool>
@@ -659,9 +655,6 @@ QPushButton {
            <property name="focusPolicy">
             <enum>Qt::TabFocus</enum>
            </property>
-           <property name="styleSheet">
-            <string notr="true">color: #041E42;</string>
-           </property>
            <property name="text">
             <string>Access to Time-Stamping service</string>
            </property>
@@ -747,9 +740,6 @@ QPushButton {
            <property name="focusPolicy">
             <enum>Qt::TabFocus</enum>
            </property>
-           <property name="styleSheet">
-            <string notr="true">color: #041E42;</string>
-           </property>
            <property name="text">
             <string>Access to mobile-ID and Smart-ID service</string>
            </property>
@@ -846,6 +836,207 @@ QPushButton {
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="pageValidation">
+      <property name="styleSheet">
+       <string notr="true">QToolButton { border: none; }
+QPushButton {
+	padding: 1px;
+	text-align: middle;
+	min-height: 30px;
+	min-width: 150px;
+}</string>
+      </property>
+      <layout class="QVBoxLayout" name="pageValidationLayout">
+       <property name="spacing">
+        <number>5</number>
+       </property>
+       <property name="leftMargin">
+        <number>20</number>
+       </property>
+       <property name="topMargin">
+        <number>20</number>
+       </property>
+       <property name="rightMargin">
+        <number>20</number>
+       </property>
+       <property name="bottomMargin">
+        <number>20</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" name="SiVaLayout">
+         <item>
+          <widget class="QLabel" name="lblSiVa">
+           <property name="focusPolicy">
+            <enum>Qt::TabFocus</enum>
+           </property>
+           <property name="text">
+            <string>Access to Digital Signature Validation Service SiVa</string>
+           </property>
+           <property name="buddy">
+            <cstring>txtSiVa</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="helpSiVa">
+           <property name="cursor">
+            <cursorShape>PointingHandCursor</cursorShape>
+           </property>
+           <property name="text">
+            <string>Help</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normalon>:/images/icon_Abi.svg</normalon>
+             <selectedon>:/images/icon_Abi_hover.svg</selectedon>
+            </iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="helpSiVaSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="RadioButton" name="rdSiVaDefault">
+         <property name="text">
+          <string>Use default access</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+         <attribute name="buttonGroup">
+          <string notr="true">rdSiVa</string>
+         </attribute>
+        </widget>
+       </item>
+       <item>
+        <widget class="RadioButton" name="rdSiVaCustom">
+         <property name="text">
+          <string>Use manually configured access</string>
+         </property>
+         <attribute name="buttonGroup">
+          <string notr="true">rdSiVa</string>
+         </attribute>
+        </widget>
+       </item>
+       <item>
+        <widget class="LineEdit" name="txtSiVa">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QWidget" name="wgtSiVaCert" native="true">
+         <layout class="QVBoxLayout" name="wgtSiVaCertLayout">
+          <property name="spacing">
+           <number>5</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>10</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="lblSiVaCert">
+            <property name="focusPolicy">
+             <enum>Qt::TabFocus</enum>
+            </property>
+            <property name="text">
+             <string>Digital Signature Validation Service SiVa SSL certificate</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="CertLabel" name="txtSiVaCert">
+            <property name="focusPolicy">
+             <enum>Qt::TabFocus</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="installSiVaCertLayout">
+            <item>
+             <widget class="QPushButton" name="btInstallSiVaCert">
+              <property name="cursor">
+               <cursorShape>PointingHandCursor</cursorShape>
+              </property>
+              <property name="text">
+               <string>ADD CERTIFICATE</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="btShowSiVaCert">
+              <property name="cursor">
+               <cursorShape>PointingHandCursor</cursorShape>
+              </property>
+              <property name="text">
+               <string>SHOW CERTIFICATE</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="installSiVaCertSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="pageValidationBottomSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="pageProxy">
       <layout class="QFormLayout" name="pageProxyLayout">
        <property name="fieldGrowthPolicy">
@@ -1398,6 +1589,11 @@ QPushButton:disabled {
    <extends>QRadioButton</extends>
    <header>widgets/RadioButton.h</header>
   </customwidget>
+  <customwidget>
+   <class>CertLabel</class>
+   <extends>QLabel</extends>
+   <header>dialogs/SettingsDialog.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
@@ -1407,5 +1603,6 @@ QPushButton:disabled {
   <buttongroup name="langGroup"/>
   <buttongroup name="rdMIDUUID"/>
   <buttongroup name="rdTimeStamp"/>
+  <buttongroup name="rdSiVa"/>
  </buttongroups>
 </ui>
diff --git a/client/translations/en.ts b/client/translations/en.ts
index 107330293..382dfe9a2 100644
--- a/client/translations/en.ts
+++ b/client/translations/en.ts
@@ -2416,10 +2416,6 @@ and enter Smart-ID PIN2-code.</translation>
         <source>GENERAL</source>
         <translation>GENERAL</translation>
     </message>
-    <message>
-        <source>SERVICES</source>
-        <translation>SERVICES</translation>
-    </message>
     <message>
         <source>PROXY</source>
         <translation>PROXY</translation>
@@ -2745,6 +2741,39 @@ Additional licenses and components</translation>
         <source>The project is supported by the European Regional Development Fund</source>
         <translation>The project is supported by the European Regional Development Fund</translation>
     </message>
+    <message>
+        <source>SIGNING SERVICES</source>
+        <translation>SIGNING SERVICES</translation>
+    </message>
+    <message>
+        <source>VALIDATION SERVICES</source>
+        <translation>VALIDATION SERVICES</translation>
+    </message>
+    <message>
+        <source>Access to Digital Signature Validation Service SiVa</source>
+        <translation>Access to Digital Signature Validation Service SiVa</translation>
+    </message>
+    <message>
+        <source>https://www.id.ee/en/article/configuring-the-siva-validation-service-in-the-digidoc4-client/</source>
+        <translation>https://www.id.ee/en/article/configuring-the-siva-validation-service-in-the-digidoc4-client/</translation>
+    </message>
+    <message>
+        <source>Digital Signature Validation Service SiVa SSL certificate</source>
+        <translation>Digital Signature Validation Service SiVa SSL certificate</translation>
+    </message>
+    <message>
+        <source>Select SiVa server certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ADD CERTIFICATE</source>
+        <translation>ADD CERTIFICATE</translation>
+    </message>
+    <message>
+        <source>SHOW CERTIFICATE</source>
+        <comment>accessCert</comment>
+        <translation>SHOW CERTIFICATE</translation>
+    </message>
 </context>
 <context>
     <name>SignatureDialog</name>
diff --git a/client/translations/et.ts b/client/translations/et.ts
index ce9919858..3c595e5b5 100644
--- a/client/translations/et.ts
+++ b/client/translations/et.ts
@@ -2416,10 +2416,6 @@ ja sisesta nutiseadmes Smart-ID PIN2-kood.</translation>
         <source>GENERAL</source>
         <translation>ÜLDINE</translation>
     </message>
-    <message>
-        <source>SERVICES</source>
-        <translation>TEENUSED</translation>
-    </message>
     <message>
         <source>PROXY</source>
         <translation>PROKSI</translation>
@@ -2454,7 +2450,7 @@ ja sisesta nutiseadmes Smart-ID PIN2-kood.</translation>
     </message>
     <message>
         <source>SHOW CERTIFICATE</source>
-        <translation>NÄITA TŌENDIT</translation>
+        <translation>NÄITA SERTIFIKAATI</translation>
     </message>
     <message>
         <source>USE DEFAULT SETTINGS</source>
@@ -2745,6 +2741,39 @@ Täiendavad litsentsid ja komponendid</translation>
         <source>The project is supported by the European Regional Development Fund</source>
         <translation>Projekti on toetatud Euroopa Liidu Regionaalarengu Fondist</translation>
     </message>
+    <message>
+        <source>SIGNING SERVICES</source>
+        <translation>ALLKIRJASTAMISTEENUSED</translation>
+    </message>
+    <message>
+        <source>VALIDATION SERVICES</source>
+        <translation>VALIDEERIMISTEENUSED</translation>
+    </message>
+    <message>
+        <source>Access to Digital Signature Validation Service SiVa</source>
+        <translation>Ligipääs valideerimisteenusele SiVa</translation>
+    </message>
+    <message>
+        <source>https://www.id.ee/en/article/configuring-the-siva-validation-service-in-the-digidoc4-client/</source>
+        <translation>https://www.id.ee/artikkel/digidoc4-kliendis-valideerimisteenuse-siva-seadistamine/</translation>
+    </message>
+    <message>
+        <source>Digital Signature Validation Service SiVa SSL certificate</source>
+        <translation>Valideerimisteenuse SiVa SSL sertifikaat</translation>
+    </message>
+    <message>
+        <source>Select SiVa server certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ADD CERTIFICATE</source>
+        <translation>LISA SERTIFIKAAT</translation>
+    </message>
+    <message>
+        <source>SHOW CERTIFICATE</source>
+        <comment>accessCert</comment>
+        <translation>NÄITA TŌENDIT</translation>
+    </message>
 </context>
 <context>
     <name>SignatureDialog</name>
diff --git a/client/translations/ru.ts b/client/translations/ru.ts
index 38aaeb1d7..c51c7e91e 100644
--- a/client/translations/ru.ts
+++ b/client/translations/ru.ts
@@ -2419,10 +2419,6 @@ and enter Smart-ID PIN2-code.</source>
         <source>GENERAL</source>
         <translation>ОСНОВНЫЕ</translation>
     </message>
-    <message>
-        <source>SERVICES</source>
-        <translation>СЛУЖБЫ</translation>
-    </message>
     <message>
         <source>PROXY</source>
         <translation>ПРОКСИ</translation>
@@ -2748,6 +2744,39 @@ Additional licenses and components</source>
         <source>The project is supported by the European Regional Development Fund</source>
         <translation>Проект поддерживается Европейским фондом регионального развития</translation>
     </message>
+    <message>
+        <source>SIGNING SERVICES</source>
+        <translation>УСЛУГИ ПОДПИСАНИЯ</translation>
+    </message>
+    <message>
+        <source>VALIDATION SERVICES</source>
+        <translation>УСЛУГИ ВАЛИДАЦИИ</translation>
+    </message>
+    <message>
+        <source>Access to Digital Signature Validation Service SiVa</source>
+        <translation>Доступ к услуге валидации SiVa</translation>
+    </message>
+    <message>
+        <source>https://www.id.ee/en/article/configuring-the-siva-validation-service-in-the-digidoc4-client/</source>
+        <translation>https://www.id.ee/ru/artikkel/nastrojka-sluzhby-validaczii-siva-v-digidoc4-klient-2/</translation>
+    </message>
+    <message>
+        <source>Digital Signature Validation Service SiVa SSL certificate</source>
+        <translation>Сертификат услуги валидации SiVa SSL</translation>
+    </message>
+    <message>
+        <source>Select SiVa server certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ADD CERTIFICATE</source>
+        <translation>ДОБАВИТЬ СЕРТИФИКАТ</translation>
+    </message>
+    <message>
+        <source>SHOW CERTIFICATE</source>
+        <comment>accessCert</comment>
+        <translation>ПОКАЗАТЬ СЕРТИФИКАТ</translation>
+    </message>
 </context>
 <context>
     <name>SignatureDialog</name>