diff --git a/client/dialogs/MobileProgress.ui b/client/dialogs/MobileProgress.ui
index 5bc2a796..9fe7e524 100644
--- a/client/dialogs/MobileProgress.ui
+++ b/client/dialogs/MobileProgress.ui
@@ -138,7 +138,7 @@ background-color: #2F70B6;
     <number>30</number>
    </property>
    <property name="sizeConstraint">
-    <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+    <enum>QLayout::SetFixedSize</enum>
    </property>
    <property name="leftMargin">
     <number>40</number>
diff --git a/client/dialogs/SettingsDialog.cpp b/client/dialogs/SettingsDialog.cpp
index 4a5e78a3..5147a2ff 100644
--- a/client/dialogs/SettingsDialog.cpp
+++ b/client/dialogs/SettingsDialog.cpp
@@ -67,6 +67,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 	for(QCheckBox *w: findChildren<QCheckBox*>())
 		w->setAttribute(Qt::WA_MacShowFocusRect, false);
+	for(QToolButton *b: findChildren<QToolButton*>())
+		b->setCursor(Qt::PointingHandCursor);
+	for(QPushButton *b: findChildren<QPushButton*>())
+		b->setCursor(Qt::PointingHandCursor);
 
 	// pageGeneral
 	selectLanguage();
@@ -151,7 +155,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	ui->txtMIDUUID->setReadOnly(Settings::MID_UUID.isLocked());
 	ui->txtMIDUUID->setVisible(ui->rdMIDUUIDCustom->isChecked());
 	ui->txtMIDUUID->setText(Settings::MID_UUID);
-	connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [=](bool checked) {
+	connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [this](bool checked) {
 		ui->txtMIDUUID->setVisible(checked);
 		Settings::MID_UUID_CUSTOM = checked;
 		Settings::SID_UUID_CUSTOM = checked;
@@ -218,13 +222,17 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		ui->txtCdoc2Fetch->setText(data.value(QLatin1String("FETCH")).toString(Settings::CDOC2_GET));
 		ui->txtCdoc2Post->setText(data.value(QLatin1String("POST")).toString(Settings::CDOC2_POST));
 		bool disabled = ui->cmbCdoc2Name->currentIndex() < ui->cmbCdoc2Name->count() - 1;
-		ui->txtCdoc2UUID->setReadOnly(disabled);
-		ui->txtCdoc2Fetch->setReadOnly(disabled);
-		ui->txtCdoc2Post->setReadOnly(disabled);
+		ui->txtCdoc2UUID->setDisabled(disabled);
+		ui->txtCdoc2Fetch->setDisabled(disabled);
+		ui->txtCdoc2Post->setDisabled(disabled);
+		ui->txtCdoc2UUID->setClearButtonEnabled(!disabled);
+		ui->txtCdoc2Fetch->setClearButtonEnabled(!disabled);
+		ui->txtCdoc2Post->setClearButtonEnabled(!disabled);
+		ui->wgtCDoc2Cert->setHidden(disabled);
 	};
 	for(QJsonObject::const_iterator i = list.constBegin(); i != list.constEnd(); ++i)
 		ui->cmbCdoc2Name->addItem(i.value().toObject().value(QLatin1String("NAME")).toString(), i.key());
-	ui->cmbCdoc2Name->addItem(tr("Custom"), Settings::CDOC2_UUID);
+	ui->cmbCdoc2Name->addItem(tr("Use a manually specified key transfer server for encryption"), Settings::CDOC2_UUID);
 	QString cdoc2Service = Settings::CDOC2_DEFAULT_KEYSERVER;
 	ui->cmbCdoc2Name->setCurrentIndex(ui->cmbCdoc2Name->findData(cdoc2Service));
 	connect(ui->cmbCdoc2Name, qOverload<int>(&QComboBox::currentIndexChanged), this, [this, setCDoc2Values] (int index) {
@@ -234,14 +242,40 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	});
 	setCDoc2Values(cdoc2Service);
 	connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, Settings::CDOC2_UUID);
-	connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, Settings::CDOC2_GET);
-	connect(ui->txtCdoc2Post, &QLineEdit::textEdited, this, Settings::CDOC2_POST);
+	connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, [this](const QString &url) {
+		Settings::CDOC2_GET = url;
+		if(url.isEmpty())
+		{
+			Settings::CDOC2_GET_CERT.clear();
+			Settings::CDOC2_POST_CERT.clear();
+			updateCDoc2Cert(QSslCertificate());
+		}
+	});
+	connect(ui->txtCdoc2Post, &QLineEdit::textEdited, this, [this](const QString &url) {
+		Settings::CDOC2_POST = url;
+		if(url.isEmpty())
+		{
+			Settings::CDOC2_GET_CERT.clear();
+			Settings::CDOC2_POST_CERT.clear();
+			updateCDoc2Cert(QSslCertificate());
+		}
+	});
 #else
 	ui->cmbCdoc2Name->addItem(QStringLiteral("Default"));
 	ui->txtCdoc2UUID->setText(QStringLiteral("00000000-0000-0000-0000-000000000000"));
 	ui->txtCdoc2Fetch->setText(QStringLiteral(CDOC2_GET_URL));
 	ui->txtCdoc2Post->setText(QStringLiteral(CDOC2_POST_URL));
 #endif
+	connect(ui->btInstallCDoc2Cert, &QPushButton::clicked, this, [this] {
+		QSslCertificate cert = selectCert(tr("Select a key transfer server certificate"),
+			tr("Key transfer server SSL certificate"));
+		if(cert.isNull())
+			return;
+		Settings::CDOC2_GET_CERT = cert.toDer().toBase64();
+		Settings::CDOC2_POST_CERT = cert.toDer().toBase64();
+		updateCDoc2Cert(cert);
+	});
+	updateCDoc2Cert(QSslCertificate(QByteArray::fromBase64(Settings::CDOC2_GET_CERT), QSsl::Der));
 
 	// pageProxy
 	connect(this, &SettingsDialog::finished, this, &SettingsDialog::saveProxy);
@@ -313,7 +347,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		dlg->open();
 	});
 #ifdef CONFIG_URL
-	connect(qApp->conf(), &Configuration::finished, this, [=](bool /*update*/, const QString &error){
+	connect(qApp->conf(), &Configuration::finished, this, [this](bool /*update*/, const QString &error){
 		if(!error.isEmpty()) {
 			WarningDialog::show(this, tr("Checking updates has failed.") + "<br />" + tr("Please try again."), error);
 			return;
@@ -334,10 +368,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		Application::updateTSLCache({});
 	});
 	connect(ui->btnNavUseByDefault, &QPushButton::clicked, this, &SettingsDialog::useDefaultSettings);
-	connect(ui->btnNavSaveReport, &QPushButton::clicked, this, [=]{
+	connect(ui->btnNavSaveReport, &QPushButton::clicked, this, [this]{
 		saveFile(QStringLiteral("diagnostics.txt"), ui->txtDiagnostics->toPlainText().toUtf8());
 	});
-	connect(ui->btnNavSaveLibdigidocpp, &QPushButton::clicked, this, [=]{
+	connect(ui->btnNavSaveLibdigidocpp, &QPushButton::clicked, this, [this]{
 		Settings::LIBDIGIDOCPP_DEBUG = false;
 		QString log = QStringLiteral("%1/libdigidocpp.log").arg(QDir::tempPath());
 		saveFile(QStringLiteral("libdigidocpp.txt"), log);
@@ -424,6 +458,8 @@ void SettingsDialog::retranslate(const QString& lang)
 	ui->retranslateUi(this);
 	updateVersion();
 	updateDiagnostics();
+	ui->cmbCdoc2Name->setItemText(ui->cmbCdoc2Name->count() - 1,
+		tr("Use a manually specified key transfer server for encryption"));
 }
 
 void SettingsDialog::updateCert(const QSslCertificate &c, QPushButton *btn, CertLabel *lbl)
@@ -439,6 +475,11 @@ void SettingsDialog::updateCert(const QSslCertificate &c, QPushButton *btn, Cert
 	});
 }
 
+void SettingsDialog::updateCDoc2Cert(const QSslCertificate &c)
+{
+	updateCert(c, ui->btShowCDoc2Cert, ui->txtCDoc2Cert);
+}
+
 void SettingsDialog::updateSiVaCert(const QSslCertificate &c)
 {
 	updateCert(c, ui->btShowSiVaCert, ui->txtSiVaCert);
@@ -469,8 +510,8 @@ void SettingsDialog::selectLanguage()
 
 void SettingsDialog::updateVersion()
 {
-	ui->txtNavVersion->setText(tr("%1 version %2, released %3")
-		.arg(tr("DigiDoc4 Client"), QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
+	ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2")
+		.arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
 }
 
 void SettingsDialog::saveProxy()
@@ -519,7 +560,7 @@ void SettingsDialog::updateDiagnostics()
 	QApplication::setOverrideCursor( Qt::WaitCursor );
 	auto *worker = new Diagnostics();
 	connect(worker, &Diagnostics::update, ui->txtDiagnostics, &QTextBrowser::insertHtml, Qt::QueuedConnection);
-	connect(worker, &Diagnostics::destroyed, this, [=]{
+	connect(worker, &Diagnostics::destroyed, this, [this]{
 		ui->txtDiagnostics->setEnabled(true);
 		ui->txtDiagnostics->moveCursor(QTextCursor::Start);
 		ui->txtDiagnostics->ensureCursorVisible();
diff --git a/client/dialogs/SettingsDialog.h b/client/dialogs/SettingsDialog.h
index 72beee7b..03be4eb6 100644
--- a/client/dialogs/SettingsDialog.h
+++ b/client/dialogs/SettingsDialog.h
@@ -71,6 +71,7 @@ class SettingsDialog final: public QDialog
 	QSslCertificate selectCert(const QString &label, const QString &format);
 	void selectLanguage();
 	void updateCert(const QSslCertificate &c, QPushButton *btn, CertLabel *lbl);
+	void updateCDoc2Cert(const QSslCertificate &c);
 	void updateSiVaCert(const QSslCertificate &c);
 	void updateTSACert(const QSslCertificate &c);
 	void updateVersion();
diff --git a/client/dialogs/SettingsDialog.ui b/client/dialogs/SettingsDialog.ui
index d11659c1..07e93c14 100644
--- a/client/dialogs/SettingsDialog.ui
+++ b/client/dialogs/SettingsDialog.ui
@@ -3,35 +3,35 @@
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>994</width>
+    <width>1010</width>
     <height>570</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>994</width>
+    <width>1010</width>
     <height>570</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>994</width>
+    <width>1010</width>
     <height>570</height>
    </size>
   </property>
   <property name="styleSheet">
    <string notr="true">QWidget {
-color: #000000;
+color: #07142A;
 font-family: Roboto, Helvetica;
 font-size: 14px;
 }
-#lblMenuSettings, #lblGeneralLang, #lblDefaultDirectory, #lblTimeStamp, #lblTSACert, #lblMID, #lblSiVa, #lblSiVaCert, #pageEncryptionLabel, #pageProxyLabel {
+#lblMenuSettings, #lblGeneralLang, #lblDefaultDirectory, #lblTimeStamp, #lblMID, #lblSiVa, #pageEncryptionLabel, #pageProxyLabel {
 color: #003168;
 font-weight: 700;
 font-size: 18px;
@@ -57,29 +57,28 @@ font-size: 18px;
     <widget class="QWidget" name="leftPane" native="true">
      <property name="minimumSize">
       <size>
-       <width>203</width>
+       <width>220</width>
        <height>0</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>203</width>
+       <width>220</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="styleSheet">
       <string notr="true">#leftPane {
 background-color: #ffffff;
-border-right: 1px solid #E7EAEF
+border-right: 1px solid #E7EAEF;
 }
 #lblMenuSettings {
-padding-left: 24;
+padding-left: 24px;
 }
 QRadioButton {
 color: #003168;
 border: none;
-padding-left: 24;
-min-height: 40px;
+padding: 13px 24px;
 }
 QRadioButton::indicator {
 width: 0px;
@@ -98,13 +97,13 @@ background-color: #E9ECF3;
        <number>0</number>
       </property>
       <property name="leftMargin">
-       <number>2</number>
+       <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>1</number>
+       <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -117,8 +116,14 @@ background-color: #E9ECF3;
           <height>61</height>
          </size>
         </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>61</height>
+         </size>
+        </property>
         <property name="focusPolicy">
-         <enum>Qt::FocusPolicy::TabFocus</enum>
+         <enum>Qt::TabFocus</enum>
         </property>
         <property name="text">
          <string>Settings</string>
@@ -204,7 +209,7 @@ background-color: #E9ECF3;
       <item>
        <spacer name="leftPaneSpacer">
         <property name="orientation">
-         <enum>Qt::Orientation::Vertical</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -217,20 +222,172 @@ background-color: #E9ECF3;
      </layout>
     </widget>
    </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QWidget" name="navigationArea" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">#navigationArea {
+border-top: 1px solid #E7EAEF;
+background-color: #F3F5F7;
+}
+QPushButton {
+padding: 10px 12px;
+border-radius: 4px;
+color: #2F70B6;
+font-size: 12px;
+font-weight: 700;
+}
+QPushButton:hover {
+background-color: #EAF1F8;
+}
+QPushButton:pressed {
+background-color: #BFD3E8;
+}
+QPushButton:default {
+color: #ffffff;
+background-color: #2F70B6;
+}
+QPushButton:default:hover {
+background-color: #2B66A6;
+}
+QPushButton:default:pressed {
+background-color: #215081;
+}
+QPushButton:default:disabled {
+background-color: #2F70B6;
+}</string>
+     </property>
+     <layout class="QHBoxLayout" name="navigationAreaLayout" stretch="1,0,0,0,0,0,0,0,0">
+      <property name="spacing">
+       <number>16</number>
+      </property>
+      <property name="leftMargin">
+       <number>24</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>24</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="txtNavVersion">
+        <property name="focusPolicy">
+         <enum>Qt::TabFocus</enum>
+        </property>
+        <property name="text">
+         <string notr="true">DigiDoc4 4.0.1.0, released 01.02.2024</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnFirstRun">
+        <property name="text">
+         <string>First run</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnRefreshConfig">
+        <property name="text">
+         <string>Refresh configuration</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnCheckConnection">
+        <property name="text">
+         <string>Check connection</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnNavSaveReport">
+        <property name="text">
+         <string>Save diagnostics report</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnNavSaveLibdigidocpp">
+        <property name="text">
+         <string>Save log</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnNavFromHistory">
+        <property name="text">
+         <string>Remove old certificates</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnNavUseByDefault">
+        <property name="text">
+         <string>Use default settings</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btNavClose">
+        <property name="text">
+         <string>Close</string>
+        </property>
+        <property name="default">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="0" column="1">
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="styleSheet">
       <string notr="true">#pageGeneral, #pageServices, #pageValidation, #pageEncryption, #pageProxy, #pageDiagnostics, #pageInfo {
 background-color: #ffffff;
 }
-#lblProxyHost, #lblProxyPort, #lblProxyUsername, #lblProxyPassword {
-color: #07142A;
-}
 QLineEdit, QComboBox {
 padding: 10px 14px;
 border: 1px solid #C4CBD8;
 border-radius: 4px;
-color: #07142A;
+background-color: white;
 placeholder-text-color: #607496;
 font-size: 16px;
 }
@@ -250,7 +407,6 @@ QComboBox QPushButton {
 margin: 3px;
 padding: 0px 12px 0px 4px;
 border: 0px;
-color: #07142A;
 text-align: left;
 font-weight: normal;
 font-size: 16px;
@@ -276,7 +432,6 @@ left: 1px;
 }
 QCheckBox, QRadioButton {
 spacing: 8px;
-color: #07142A;
 border: none; /*Workaround for right padding*/
 border: 2px solid transparent;
 border-radius: 4px;
@@ -325,10 +480,11 @@ QRadioButton::indicator:checked:disabled {
 image: url(:/images/icon_radio_check_disabled.svg);
 }
 QPushButton {
-padding: 9px 12px;
+padding: 10px 12px;
 border: 1px solid #2F70B6;
 border-radius: 4px;
 color: #2F70B6;
+font-size: 12px;
 font-weight: 700;
 }
 QPushButton:hover {
@@ -343,7 +499,7 @@ max-height: 22px;
 }</string>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="pageGeneral">
       <layout class="QVBoxLayout" name="pageGeneralLayout">
@@ -365,7 +521,7 @@ max-height: 22px;
        <item>
         <widget class="QLabel" name="lblGeneralLang">
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="text">
           <string>Language</string>
@@ -435,7 +591,7 @@ max-height: 22px;
        <item>
         <widget class="QLabel" name="lblDefaultDirectory">
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="text">
           <string>Container default location</string>
@@ -472,9 +628,6 @@ max-height: 22px;
          </item>
          <item row="0" column="1" rowspan="2">
           <widget class="QPushButton" name="btGeneralChooseDirectory">
-           <property name="cursor">
-            <cursorShape>PointingHandCursor</cursorShape>
-           </property>
            <property name="text">
             <string notr="true">...</string>
            </property>
@@ -488,7 +641,7 @@ max-height: 22px;
        <item>
         <spacer name="pageGeneralSpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -502,7 +655,7 @@ max-height: 22px;
      </widget>
      <widget class="QScrollArea" name="pageServicesScrollArea">
       <property name="frameShape">
-       <enum>QFrame::Shape::NoFrame</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="widgetResizable">
        <bool>true</bool>
@@ -512,8 +665,8 @@ max-height: 22px;
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>791</width>
-         <height>577</height>
+         <width>467</width>
+         <height>573</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="pageServicesLayout">
@@ -537,7 +690,7 @@ max-height: 22px;
           <item>
            <widget class="QLabel" name="lblTimeStamp">
             <property name="focusPolicy">
-             <enum>Qt::FocusPolicy::TabFocus</enum>
+             <enum>Qt::TabFocus</enum>
             </property>
             <property name="text">
              <string>Access to Time-Stamping service</string>
@@ -549,9 +702,6 @@ max-height: 22px;
           </item>
           <item>
            <widget class="QToolButton" name="helpTimeStamp">
-            <property name="cursor">
-             <cursorShape>PointingHandCursor</cursorShape>
-            </property>
             <property name="text">
              <string>Help</string>
             </property>
@@ -570,7 +720,7 @@ max-height: 22px;
           <item>
            <spacer name="helpTimeStampSpacer">
             <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
+             <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -640,7 +790,7 @@ max-height: 22px;
            <item>
             <widget class="QLabel" name="lblTSACert">
              <property name="focusPolicy">
-              <enum>Qt::FocusPolicy::TabFocus</enum>
+              <enum>Qt::TabFocus</enum>
              </property>
              <property name="text">
               <string>Time-Stamping service SSL certificate</string>
@@ -650,7 +800,7 @@ max-height: 22px;
            <item>
             <widget class="CertLabel" name="txtTSACert">
              <property name="focusPolicy">
-              <enum>Qt::FocusPolicy::TabFocus</enum>
+              <enum>Qt::TabFocus</enum>
              </property>
             </widget>
            </item>
@@ -661,9 +811,6 @@ max-height: 22px;
              </property>
              <item>
               <widget class="QPushButton" name="btInstallTSACert">
-               <property name="cursor">
-                <cursorShape>PointingHandCursor</cursorShape>
-               </property>
                <property name="text">
                 <string>Add certificate</string>
                </property>
@@ -671,9 +818,6 @@ max-height: 22px;
              </item>
              <item>
               <widget class="QPushButton" name="btShowTSACert">
-               <property name="cursor">
-                <cursorShape>PointingHandCursor</cursorShape>
-               </property>
                <property name="text">
                 <string>Show certificate</string>
                </property>
@@ -682,7 +826,7 @@ max-height: 22px;
              <item>
               <spacer name="installTSACertSpacer">
                <property name="orientation">
-                <enum>Qt::Orientation::Horizontal</enum>
+                <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
@@ -702,7 +846,7 @@ max-height: 22px;
           <item>
            <widget class="QLabel" name="lblMID">
             <property name="focusPolicy">
-             <enum>Qt::FocusPolicy::TabFocus</enum>
+             <enum>Qt::TabFocus</enum>
             </property>
             <property name="text">
              <string>Access to mobile-ID and Smart-ID service</string>
@@ -711,9 +855,6 @@ max-height: 22px;
           </item>
           <item>
            <widget class="QToolButton" name="helpMID">
-            <property name="cursor">
-             <cursorShape>PointingHandCursor</cursorShape>
-            </property>
             <property name="text">
              <string>Help</string>
             </property>
@@ -732,7 +873,7 @@ max-height: 22px;
           <item>
            <spacer name="helpMIDSpacer">
             <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
+             <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -777,7 +918,7 @@ max-height: 22px;
         <item>
          <widget class="LineEdit" name="txtMIDUUID">
           <property name="echoMode">
-           <enum>QLineEdit::EchoMode::Password</enum>
+           <enum>QLineEdit::Password</enum>
           </property>
           <property name="placeholderText">
            <string notr="true">00000000-0000-0000-0000-000000000000</string>
@@ -790,7 +931,7 @@ max-height: 22px;
         <item>
          <spacer name="pageServicesBottomSpacer">
           <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
+           <enum>Qt::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -825,7 +966,7 @@ max-height: 22px;
          <item>
           <widget class="QLabel" name="lblSiVa">
            <property name="focusPolicy">
-            <enum>Qt::FocusPolicy::TabFocus</enum>
+            <enum>Qt::TabFocus</enum>
            </property>
            <property name="text">
             <string>Access to Digital Signature Validation Service SiVa</string>
@@ -837,9 +978,6 @@ max-height: 22px;
          </item>
          <item>
           <widget class="QToolButton" name="helpSiVa">
-           <property name="cursor">
-            <cursorShape>PointingHandCursor</cursorShape>
-           </property>
            <property name="text">
             <string>Help</string>
            </property>
@@ -858,7 +996,7 @@ max-height: 22px;
          <item>
           <spacer name="helpSiVaSpacer">
            <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
+            <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -928,7 +1066,7 @@ max-height: 22px;
           <item>
            <widget class="QLabel" name="lblSiVaCert">
             <property name="focusPolicy">
-             <enum>Qt::FocusPolicy::TabFocus</enum>
+             <enum>Qt::TabFocus</enum>
             </property>
             <property name="text">
              <string>Digital Signature Validation Service SiVa SSL certificate</string>
@@ -938,7 +1076,7 @@ max-height: 22px;
           <item>
            <widget class="CertLabel" name="txtSiVaCert">
             <property name="focusPolicy">
-             <enum>Qt::FocusPolicy::TabFocus</enum>
+             <enum>Qt::TabFocus</enum>
             </property>
            </widget>
           </item>
@@ -949,9 +1087,6 @@ max-height: 22px;
             </property>
             <item>
              <widget class="QPushButton" name="btInstallSiVaCert">
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
               <property name="text">
                <string>Add certificate</string>
               </property>
@@ -959,9 +1094,6 @@ max-height: 22px;
             </item>
             <item>
              <widget class="QPushButton" name="btShowSiVaCert">
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
               <property name="text">
                <string>Show certificate</string>
               </property>
@@ -970,7 +1102,7 @@ max-height: 22px;
             <item>
              <spacer name="installSiVaCertSpacer">
               <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
+               <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -988,7 +1120,7 @@ max-height: 22px;
        <item>
         <spacer name="pageValidationBottomSpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1000,211 +1132,290 @@ max-height: 22px;
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="pageEncryption">
-      <layout class="QVBoxLayout" name="pageEncryptionLayout">
-       <property name="spacing">
-        <number>24</number>
-       </property>
-       <property name="leftMargin">
-        <number>32</number>
-       </property>
-       <property name="topMargin">
-        <number>19</number>
-       </property>
-       <property name="rightMargin">
-        <number>32</number>
-       </property>
-       <property name="bottomMargin">
-        <number>32</number>
+     <widget class="QScrollArea" name="pageEncryptionScrollArea">
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="pageEncryption">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>790</width>
+         <height>610</height>
+        </rect>
        </property>
-       <item>
-        <widget class="QLabel" name="pageEncryptionLabel">
-         <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
-         </property>
-         <property name="text">
-          <string>Encryption settings</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="rdCdocLayout">
-         <property name="spacing">
-          <number>15</number>
-         </property>
-         <item>
-          <widget class="QRadioButton" name="rdCdoc1">
-           <property name="text">
-            <string>Use default CDOC1 solution</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-           <attribute name="buttonGroup">
-            <string notr="true">cdoc2Group</string>
-           </attribute>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="rdCdoc2">
-           <property name="text">
-            <string>Use default CDOC2 solution</string>
-           </property>
-           <attribute name="buttonGroup">
-            <string notr="true">cdoc2Group</string>
-           </attribute>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QWidget" name="wgtCDoc2" native="true">
-         <layout class="QVBoxLayout" name="wgtCDoc2Layout">
-          <property name="spacing">
-           <number>24</number>
-          </property>
-          <property name="leftMargin">
-           <number>24</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
+       <layout class="QVBoxLayout" name="pageEncryptionLayout">
+        <property name="spacing">
+         <number>24</number>
+        </property>
+        <property name="leftMargin">
+         <number>32</number>
+        </property>
+        <property name="topMargin">
+         <number>19</number>
+        </property>
+        <property name="rightMargin">
+         <number>32</number>
+        </property>
+        <property name="bottomMargin">
+         <number>32</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="pageEncryptionLabel">
+          <property name="focusPolicy">
+           <enum>Qt::TabFocus</enum>
           </property>
-          <property name="rightMargin">
-           <number>0</number>
+          <property name="text">
+           <string>Encryption settings</string>
           </property>
-          <property name="bottomMargin">
-           <number>0</number>
+         </widget>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="rdCdocLayout">
+          <property name="spacing">
+           <number>15</number>
           </property>
           <item>
-           <widget class="QCheckBox" name="chkCdoc2KeyServer">
+           <widget class="QRadioButton" name="rdCdoc1">
             <property name="text">
-             <string notr="true">Use key server</string>
+             <string>Use CDOC1 file format for encryption</string>
             </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">cdoc2Group</string>
+            </attribute>
            </widget>
           </item>
           <item>
-           <widget class="QWidget" name="wgtCDoc2Server" native="true">
-            <layout class="QFormLayout" name="wgtCDoc2ServerLayout">
-             <property name="fieldGrowthPolicy">
-              <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
-             </property>
-             <property name="labelAlignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
-             </property>
-             <property name="verticalSpacing">
-              <number>24</number>
-             </property>
-             <property name="leftMargin">
-              <number>24</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="lblCdoc2Name">
-               <property name="minimumSize">
-                <size>
-                 <width>140</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string notr="true">Name</string>
-               </property>
-               <property name="buddy">
-                <cstring>cmbCdoc2Name</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="ComboBox" name="cmbCdoc2Name"/>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="lblCdoc2UUID">
-               <property name="text">
-                <string notr="true">UUID</string>
-               </property>
-               <property name="buddy">
-                <cstring>txtCdoc2UUID</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLineEdit" name="txtCdoc2UUID">
-               <property name="readOnly">
-                <bool>true</bool>
-               </property>
-               <property name="clearButtonEnabled">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="lblCdoc2Fetch">
-               <property name="text">
-                <string notr="true">Fetch URL</string>
-               </property>
-               <property name="buddy">
-                <cstring>txtCdoc2Fetch</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QLineEdit" name="txtCdoc2Fetch">
-               <property name="readOnly">
-                <bool>true</bool>
-               </property>
-               <property name="clearButtonEnabled">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="lblCdoc2Post">
-               <property name="text">
-                <string notr="true">Post URL</string>
-               </property>
-               <property name="buddy">
-                <cstring>txtCdoc2Post</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QLineEdit" name="txtCdoc2Post">
-               <property name="readOnly">
-                <bool>true</bool>
-               </property>
-               <property name="clearButtonEnabled">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
+           <widget class="QRadioButton" name="rdCdoc2">
+            <property name="text">
+             <string>Use CDOC2 file format for encryption</string>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">cdoc2Group</string>
+            </attribute>
            </widget>
           </item>
          </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="pageEncryptionSpacer">
-         <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+        </item>
+        <item>
+         <widget class="QWidget" name="wgtCDoc2" native="true">
+          <layout class="QVBoxLayout" name="wgtCDoc2Layout">
+           <property name="spacing">
+            <number>24</number>
+           </property>
+           <property name="leftMargin">
+            <number>24</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QCheckBox" name="chkCdoc2KeyServer">
+             <property name="text">
+              <string>Use a key transfer server for encryption</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QWidget" name="wgtCDoc2Server" native="true">
+             <layout class="QFormLayout" name="wgtCDoc2ServerLayout">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+              </property>
+              <property name="labelAlignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+              <property name="verticalSpacing">
+               <number>24</number>
+              </property>
+              <property name="leftMargin">
+               <number>24</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+              <item row="0" column="0">
+               <widget class="QLabel" name="lblCdoc2Name">
+                <property name="minimumSize">
+                 <size>
+                  <width>140</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>Name</string>
+                </property>
+                <property name="buddy">
+                 <cstring>cmbCdoc2Name</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="ComboBox" name="cmbCdoc2Name"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="lblCdoc2UUID">
+                <property name="text">
+                 <string notr="true">UUID</string>
+                </property>
+                <property name="buddy">
+                 <cstring>txtCdoc2UUID</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="txtCdoc2UUID">
+                <property name="clearButtonEnabled">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="lblCdoc2Fetch">
+                <property name="text">
+                 <string>Fetch URL</string>
+                </property>
+                <property name="buddy">
+                 <cstring>txtCdoc2Fetch</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="txtCdoc2Fetch">
+                <property name="clearButtonEnabled">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="lblCdoc2Post">
+                <property name="text">
+                 <string>Post URL</string>
+                </property>
+                <property name="buddy">
+                 <cstring>txtCdoc2Post</cstring>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="txtCdoc2Post">
+                <property name="clearButtonEnabled">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0" colspan="2">
+               <widget class="QWidget" name="wgtCDoc2Cert" native="true">
+                <layout class="QVBoxLayout" name="wgtCDoc2CertLayout">
+                 <property name="spacing">
+                  <number>24</number>
+                 </property>
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="lblCDoc2Cert">
+                   <property name="focusPolicy">
+                    <enum>Qt::TabFocus</enum>
+                   </property>
+                   <property name="text">
+                    <string>Key transfer server SSL certificate</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="CertLabel" name="txtCDoc2Cert">
+                   <property name="focusPolicy">
+                    <enum>Qt::TabFocus</enum>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="installCDoc2CertLayout">
+                   <property name="spacing">
+                    <number>16</number>
+                   </property>
+                   <item>
+                    <widget class="QPushButton" name="btInstallCDoc2Cert">
+                     <property name="text">
+                      <string>Add certificate</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="btShowCDoc2Cert">
+                     <property name="text">
+                      <string>Show certificate</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="installCDoc2CertSpacer">
+                     <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>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <spacer name="pageEncryptionSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
      </widget>
      <widget class="QWidget" name="pageProxy">
       <layout class="QVBoxLayout" name="pageProxyLayout">
@@ -1225,6 +1436,9 @@ max-height: 22px;
        </property>
        <item>
         <widget class="QLabel" name="pageProxyLabel">
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
+         </property>
          <property name="text">
           <string>Proxy</string>
          </property>
@@ -1369,7 +1583,7 @@ max-height: 22px;
             <item>
              <widget class="QLineEdit" name="txtProxyPassword">
               <property name="echoMode">
-               <enum>QLineEdit::EchoMode::Password</enum>
+               <enum>QLineEdit::Password</enum>
               </property>
              </widget>
             </item>
@@ -1381,7 +1595,7 @@ max-height: 22px;
        <item>
         <spacer name="pageProxySpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1426,22 +1640,19 @@ QScrollBar {
 	background: #FFFFFF;
 }
 QScrollBar::handle:vertical {
-    background-color: #8E969D;
+background-color: #8E969D;
 	margin: 0 0 0 0;
 	border-radius: 2px;
 	height: 145px;
 }
-QScrollBar::add-line:vertical {
-      border: none;
-      background: none;
-}
+QScrollBar::add-line:vertical,
 QScrollBar::sub-line:vertical {
-      border: none;
-      background: none;
+border: none;
+background: none;
 }</string>
          </property>
          <property name="frameShape">
-          <enum>QFrame::Shape::NoFrame</enum>
+          <enum>QFrame::NoFrame</enum>
          </property>
          <property name="readOnly">
           <bool>true</bool>
@@ -1474,7 +1685,7 @@ QScrollBar::sub-line:vertical {
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item alignment="Qt::AlignmentFlag::AlignHCenter|Qt::AlignmentFlag::AlignVCenter">
+       <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
         <widget class="QSvgWidget" name="structureFunds" native="true">
          <property name="minimumSize">
           <size>
@@ -1489,7 +1700,7 @@ QScrollBar::sub-line:vertical {
           </size>
          </property>
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="accessibleName">
           <string>The project is supported by the European Regional Development Fund</string>
@@ -1499,7 +1710,7 @@ QScrollBar::sub-line:vertical {
        <item>
         <widget class="QLabel" name="contact">
          <property name="focusPolicy">
-          <enum>Qt::FocusPolicy::TabFocus</enum>
+          <enum>Qt::TabFocus</enum>
          </property>
          <property name="text">
           <string>&lt;p&gt;Estonian ID-software is released by Information Systems's Authority&lt;br /&gt;
@@ -1507,7 +1718,7 @@ In case of questions please contact our support via &lt;a href=&quot;https://www
 Additional licenses and components</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
+          <set>Qt::AlignCenter</set>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -1532,19 +1743,19 @@ QScrollBar {
 	background: #FFFFFF;
 }
 QScrollBar::handle:vertical {
-    background-color: #8E969D;
+background-color: #8E969D;
 	margin: 0 0 0 0;
 	border-radius: 2px;
 	height: 145px;
 }
 QScrollBar::add-line:vertical,
 QScrollBar::sub-line:vertical {
-      border: none;
-      background: none;
+border: none;
+background: none;
 }</string>
          </property>
          <property name="frameShape">
-          <enum>QFrame::Shape::NoFrame</enum>
+          <enum>QFrame::NoFrame</enum>
          </property>
          <property name="readOnly">
           <bool>true</bool>
@@ -1568,7 +1779,7 @@ p, li { white-space: pre-wrap; margin-top:12px; margin-bottom:12px; margin-left:
 &lt;p align=&quot;center&quot;&gt;&lt;b&gt;Roboto: Google’s signature family of fonts&lt;/b&gt;&lt;br /&gt;Apache Software License, Version 2.0&lt;br /&gt;&lt;a href=&quot;https://github.com/google/roboto/blob/master/LICENSE&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;https://github.com/google/roboto/blob/master/LICENSE&lt;/a&gt; &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
-          <set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
+          <set>Qt::TextBrowserInteraction</set>
          </property>
          <property name="openExternalLinks">
           <bool>true</bool>
@@ -1579,179 +1790,6 @@ p, li { white-space: pre-wrap; margin-top:12px; margin-bottom:12px; margin-left:
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QWidget" name="navigationArea" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>48</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>48</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">#navigationArea {
-border-top: 1px solid #E7EAEF;
-background-color: #F3F5F7;
-}
-#txtNavVersion {
-color: #07142A;
-}
-QPushButton {
-padding: 9px 12px;
-border-radius: 4px;
-color: #2F70B6;
-font-weight: 700;
-}
-QPushButton:hover {
-background-color: #EAF1F8;
-}
-QPushButton:pressed {
-background-color: #BFD3E8;
-}
-QPushButton:default {
-color: #ffffff;
-background-color: #2F70B6;
-}
-QPushButton:default:hover {
-background-color: #2B66A6;
-}
-QPushButton:default:pressed {
-background-color: #215081;
-}
-QPushButton:default:disabled {
-background-color: #2F70B6;
-}</string>
-     </property>
-     <layout class="QHBoxLayout" name="navigationAreaLayout">
-      <property name="spacing">
-       <number>40</number>
-      </property>
-      <property name="leftMargin">
-       <number>24</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>40</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="txtNavVersion">
-        <property name="focusPolicy">
-         <enum>Qt::FocusPolicy::TabFocus</enum>
-        </property>
-        <property name="text">
-         <string notr="true">DigiDoc4 4.0.1.0, released 01.02.2024</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="navigationAreaSpacer">
-        <property name="orientation">
-         <enum>Qt::Orientation::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>10</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnFirstRun">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>First run</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnRefreshConfig">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Refresh configuration</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnCheckConnection">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Check connection</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnNavSaveReport">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Save diagnostics report</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnNavSaveLibdigidocpp">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Save log</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnNavFromHistory">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Remove old certificates</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnNavUseByDefault">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Use default settings</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btNavClose">
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="text">
-         <string>Close</string>
-        </property>
-        <property name="default">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -1777,16 +1815,18 @@ background-color: #2F70B6;
    <header>dialogs/SettingsDialog.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../images/images.qrc"/>
+ </resources>
  <connections/>
  <buttongroups>
-  <buttongroup name="pageGroup"/>
   <buttongroup name="pathGroup"/>
+  <buttongroup name="pageGroup"/>
+  <buttongroup name="rdSiVa"/>
   <buttongroup name="langGroup"/>
+  <buttongroup name="cdoc2Group"/>
   <buttongroup name="rdMIDUUID"/>
   <buttongroup name="rdTimeStamp"/>
-  <buttongroup name="rdSiVa"/>
-  <buttongroup name="cdoc2Group"/>
   <buttongroup name="proxyGroup"/>
  </buttongroups>
 </ui>
diff --git a/client/translations/en.ts b/client/translations/en.ts
index c0d8ea6b..e6dad8b2 100644
--- a/client/translations/en.ts
+++ b/client/translations/en.ts
@@ -2374,10 +2374,6 @@ ID-CARD</translation>
         <source>The connection to certificate status service is successful!</source>
         <translation>Network settings are correct, certificate status service is accessible!</translation>
     </message>
-    <message>
-        <source>DigiDoc4 Client</source>
-        <translation>DigiDoc4 Client</translation>
-    </message>
     <message>
         <source>Checking updates has failed.</source>
         <translation>Checking updates has failed.</translation>
@@ -2480,8 +2476,8 @@ Additional licenses and components</translation>
         <translation>DigiDoc4 Client configuration update was successful.</translation>
     </message>
     <message>
-        <source>%1 version %2, released %3</source>
-        <translation>%1 version %2, released %3</translation>
+        <source>DigiDoc4 version %1, released %2</source>
+        <translation>DigiDoc4 version %1, released %2</translation>
     </message>
     <message>
         <source>Use default access</source>
@@ -2556,15 +2552,39 @@ Additional licenses and components</translation>
         <translation>Show certificate</translation>
     </message>
     <message>
-        <source>Use default CDOC1 solution</source>
+        <source>Use CDOC1 file format for encryption</source>
+        <translation>Use CDOC1 file format for encryption</translation>
+    </message>
+    <message>
+        <source>Use CDOC2 file format for encryption</source>
+        <translation>Use CDOC2 file format for encryption</translation>
+    </message>
+    <message>
+        <source>Use a manually specified key transfer server for encryption</source>
+        <translation>Use a manually specified key transfer server for encryption</translation>
+    </message>
+    <message>
+        <source>Key transfer server SSL certificate</source>
+        <translation>Key transfer server SSL certificate</translation>
+    </message>
+    <message>
+        <source>Select a key transfer server certificate</source>
+        <translation>Select a key transfer server certificate</translation>
+    </message>
+    <message>
+        <source>Use a key transfer server for encryption</source>
+        <translation>Use a key transfer server for encryption</translation>
+    </message>
+    <message>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use default CDOC2 solution</source>
+        <source>Fetch URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Custom</source>
+        <source>Post URL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/client/translations/et.ts b/client/translations/et.ts
index 4ec7d101..c5ff0646 100644
--- a/client/translations/et.ts
+++ b/client/translations/et.ts
@@ -2374,10 +2374,6 @@ ID-KAARDIGA</translation>
         <source>The connection to certificate status service is successful!</source>
         <translation>Interneti seaded on korrektsed, kehtivuskinnitusteenus on kättesaadav!</translation>
     </message>
-    <message>
-        <source>DigiDoc4 Client</source>
-        <translation>DigiDoc4 klient</translation>
-    </message>
     <message>
         <source>Checking updates has failed.</source>
         <translation>Värskenduste kontrollimine on ebaõnnestunud.</translation>
@@ -2480,8 +2476,8 @@ Täiendavad litsentsid ja komponendid</translation>
         <translation>DigiDoc4 kliendi konfiguratsiooni värskendamine õnnestus.</translation>
     </message>
     <message>
-        <source>%1 version %2, released %3</source>
-        <translation>%1 versioon %2, avalikustatud %3</translation>
+        <source>DigiDoc4 version %1, released %2</source>
+        <translation>DigiDoc4 versioon %1, avalikustatud %2</translation>
     </message>
     <message>
         <source>Use default access</source>
@@ -2545,7 +2541,7 @@ Täiendavad litsentsid ja komponendid</translation>
     </message>
     <message>
         <source>Encryption settings</source>
-        <translation>Krüpteerimiseseaded</translation>
+        <translation>Krüpteerimisseaded</translation>
     </message>
     <message>
         <source>Add certificate</source>
@@ -2556,15 +2552,39 @@ Täiendavad litsentsid ja komponendid</translation>
         <translation>Näita sertifikaati</translation>
     </message>
     <message>
-        <source>Use default CDOC1 solution</source>
+        <source>Use CDOC1 file format for encryption</source>
+        <translation>Kasuta krüpteerimiseks CDOC1 failivormingut</translation>
+    </message>
+    <message>
+        <source>Use CDOC2 file format for encryption</source>
+        <translation>Kasuta krüpteerimiseks CDOC2 failivormingut</translation>
+    </message>
+    <message>
+        <source>Use a manually specified key transfer server for encryption</source>
+        <translation>Kasuta krüpteerimiseks käsitsi määratud võtmeedastusserverit</translation>
+    </message>
+    <message>
+        <source>Key transfer server SSL certificate</source>
+        <translation>Võtmeedastusserveri SSL sertifikaat</translation>
+    </message>
+    <message>
+        <source>Select a key transfer server certificate</source>
+        <translation>Vali võtmeedastusserveri sertifikaat</translation>
+    </message>
+    <message>
+        <source>Use a key transfer server for encryption</source>
+        <translation>Kasuta krüpteerimiseks võtmeedastusserverit</translation>
+    </message>
+    <message>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use default CDOC2 solution</source>
+        <source>Fetch URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Custom</source>
+        <source>Post URL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/client/translations/ru.ts b/client/translations/ru.ts
index 4d240664..4f4d61cd 100644
--- a/client/translations/ru.ts
+++ b/client/translations/ru.ts
@@ -2375,10 +2375,6 @@ ID-КАРТОЙ</translation>
         <source>The connection to certificate status service is successful!</source>
         <translation>Настройки Интернета верны, услуга подтверждения действительности доступна!</translation>
     </message>
-    <message>
-        <source>DigiDoc4 Client</source>
-        <translation>DigiDoc4 клиент</translation>
-    </message>
     <message>
         <source>Checking updates has failed.</source>
         <translation>Ошибка проверки обновлений.</translation>
@@ -2481,8 +2477,8 @@ Additional licenses and components</source>
         <translation>Обновление конфигурации программы DigiDoc4 удачно завершено.</translation>
     </message>
     <message>
-        <source>%1 version %2, released %3</source>
-        <translation>%1 версия %2, выпущенный %3</translation>
+        <source>DigiDoc4 version %1, released %2</source>
+        <translation>DigiDoc4 версия %1, выпущенный %2</translation>
     </message>
     <message>
         <source>Use default access</source>
@@ -2546,7 +2542,7 @@ Additional licenses and components</source>
     </message>
     <message>
         <source>Encryption settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки шифрования</translation>
     </message>
     <message>
         <source>Add certificate</source>
@@ -2557,15 +2553,39 @@ Additional licenses and components</source>
         <translation>Показать сертификат</translation>
     </message>
     <message>
-        <source>Use default CDOC1 solution</source>
+        <source>Use CDOC1 file format for encryption</source>
+        <translation>Для шифрования используйте формат файла CDOC1</translation>
+    </message>
+    <message>
+        <source>Use CDOC2 file format for encryption</source>
+        <translation>Для шифрования используйте формат файла CDOC2</translation>
+    </message>
+    <message>
+        <source>Use a manually specified key transfer server for encryption</source>
+        <translation>Используйте вручную указанный сервер передачи ключей для шифрования</translation>
+    </message>
+    <message>
+        <source>Key transfer server SSL certificate</source>
+        <translation>SSL-сертификат сервера передачи ключей</translation>
+    </message>
+    <message>
+        <source>Select a key transfer server certificate</source>
+        <translation>Выберите сертификат сервера передачи ключей</translation>
+    </message>
+    <message>
+        <source>Use a key transfer server for encryption</source>
+        <translation>Используйте сервер передачи ключей для шифрования</translation>
+    </message>
+    <message>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use default CDOC2 solution</source>
+        <source>Fetch URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Custom</source>
+        <source>Post URL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>