From ac191b777a47ff670abe0ded0e4fe9b7d3195291 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 25 Oct 2024 09:28:39 +0300
Subject: [PATCH] Update dialogs to new UI guidlines

* AddRecipients
* CertificateDetails
* CertificateHistory
* KeyDialog

IB-7969

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 client/CMakeLists.txt                    |   2 +-
 client/dialogs/AddRecipients.cpp         | 212 +++-----
 client/dialogs/AddRecipients.h           |  12 +-
 client/dialogs/AddRecipients.ui          | 194 +++----
 client/dialogs/CertificateDetails.cpp    |  64 +--
 client/dialogs/CertificateDetails.h      |   8 +-
 client/dialogs/CertificateDetails.ui     | 631 +++++++++--------------
 client/dialogs/CertificateDetails_mac.mm |  54 +-
 client/dialogs/CertificateHistory.cpp    |  42 +-
 client/dialogs/CertificateHistory.h      |   2 +-
 client/dialogs/CertificateHistory.ui     | 366 +++++++------
 client/dialogs/KeyDialog.cpp             |  34 +-
 client/dialogs/KeyDialog.ui              | 189 +++----
 client/dialogs/MobileDialog.ui           |   5 +-
 client/dialogs/MobileProgress.ui         |   5 +-
 client/dialogs/PinPopup.ui               |   5 +-
 client/dialogs/PinUnblock.ui             |   5 +-
 client/dialogs/RoleAddressDialog.ui      |   5 +-
 client/dialogs/SettingsDialog.ui         |   2 +-
 client/dialogs/SmartIDDialog.ui          |   5 +-
 client/translations/en.ts                |  68 +--
 client/translations/et.ts                |  68 +--
 client/translations/ru.ts                |  70 +--
 23 files changed, 786 insertions(+), 1262 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b2251bcb4..bed01b7c7 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -162,7 +162,7 @@ if( APPLE )
 	target_sources(${PROJECT_NAME} PRIVATE ${RESOURCE_FILES} Application_mac.mm MacMenuBar.cpp MacMenuBar.h dialogs/CertificateDetails_mac.mm Diagnostics_unix.cpp)
 	set_source_files_properties( Application_mac.mm dialogs/CertificateDetails_mac.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc" )
 	set_source_files_properties( LdapSearch.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
-	target_link_libraries(${PROJECT_NAME} "-framework Quartz" "-fobjc-arc")
+	target_link_libraries(${PROJECT_NAME} "-framework QuickLookUI" "-fobjc-arc")
 	find_library(PKCS11_MODULE NAMES opensc-pkcs11.so HINTS /Library/OpenSC/lib)
 	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 		COMMAND cp -a ${PKCS11_MODULE} $<TARGET_FILE_DIR:${PROJECT_NAME}>
diff --git a/client/dialogs/AddRecipients.cpp b/client/dialogs/AddRecipients.cpp
index 24675aa7b..5da28c718 100644
--- a/client/dialogs/AddRecipients.cpp
+++ b/client/dialogs/AddRecipients.cpp
@@ -29,13 +29,11 @@
 #include "LdapSearch.h"
 #include "QSigner.h"
 #include "Settings.h"
-#include "Styles.h"
 #include "TokenData.h"
 #include "dialogs/WarningDialog.h"
 #include "effects/Overlay.h"
 
 #include <QtCore/QDateTime>
-#include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 #include <QtNetwork/QSslConfiguration>
@@ -56,22 +54,11 @@ AddRecipients::AddRecipients(ItemList* itemList, QWidget *parent)
 	new Overlay(this);
 
 	ui->leftPane->init(ria::qdigidoc4::ToAddAdresses, QT_TRANSLATE_NOOP("ItemList", "Add recipients"));
-	ui->leftPane->setFont(Styles::font(Styles::Regular, 20));
 	ui->rightPane->init(ria::qdigidoc4::AddedAdresses, QT_TRANSLATE_NOOP("ItemList", "Added recipients"));
-	ui->rightPane->setFont(Styles::font(Styles::Regular, 20));
 
-	ui->fromCard->setFont(Styles::font(Styles::Condensed, 12));
-	ui->fromFile->setFont(Styles::font(Styles::Condensed, 12));
-	ui->fromHistory->setFont(Styles::font(Styles::Condensed, 12));
-
-	ui->cancel->setFont(Styles::font(Styles::Condensed, 14));
-	ui->confirm->setFont(Styles::font(Styles::Condensed, 14));
-
-	ui->confirm->setDisabled(rightList.isEmpty());
 	connect(ui->confirm, &QPushButton::clicked, this, &AddRecipients::accept);
 	connect(ui->cancel, &QPushButton::clicked, this, &AddRecipients::reject);
 	connect(ui->leftPane, &ItemList::search, this, [&](const QString &term) {
-		leftList.clear();
 		ui->leftPane->clear();
 		search(term);
 	});
@@ -81,18 +68,26 @@ AddRecipients::AddRecipients(ItemList* itemList, QWidget *parent)
 	connect(ldap_corp, &LdapSearch::error, this, &AddRecipients::showError);
 	connect(this, &AddRecipients::finished, this, &AddRecipients::close);
 
-	connect(ui->leftPane, &ItemList::addAll, this, &AddRecipients::addAllRecipientToRightPane );
+	connect(ui->leftPane, &ItemList::addAll, this, [this] {
+		for(Item *item: ui->leftPane->items)
+			addRecipientToRightPane(item);
+	});
 	connect(ui->rightPane, &ItemList::removed, ui->rightPane, &ItemList::removeItem );
 
-	connect(ui->fromCard, &QPushButton::clicked, this, &AddRecipients::addRecipientFromCard);
-	connect( qApp->signer(), &QSigner::authDataChanged, this, &AddRecipients::enableRecipientFromCard );
+	connect(ui->fromCard, &QPushButton::clicked, this, [this] {
+		addRecipient(qApp->signer()->tokenauth().cert());
+	});
+	auto enableRecipientFromCard = [this] {
+		ui->fromCard->setDisabled(qApp->signer()->tokenauth().cert().isNull());
+	};
 	enableRecipientFromCard();
+	connect(qApp->signer(), &QSigner::authDataChanged, this, std::move(enableRecipientFromCard));
 
 	connect(ui->fromFile, &QPushButton::clicked, this, &AddRecipients::addRecipientFromFile);
 	connect(ui->fromHistory, &QPushButton::clicked, this, &AddRecipients::addRecipientFromHistory);
 
 	for(Item *item: itemList->items)
-		addRecipientToRightPane((qobject_cast<AddressItem *>(item))->getKey(), false);
+		addRecipientToRightPane(item, false);
 }
 
 AddRecipients::~AddRecipients()
@@ -101,25 +96,6 @@ AddRecipients::~AddRecipients()
 	delete ui;
 }
 
-void AddRecipients::addAllRecipientToRightPane()
-{
-	QList<SslCertificate> history;
-	for(AddressItem *value: leftList)
-	{
-		if(rightList.contains(value->getKey()))
-			continue;
-		addRecipientToRightPane(value);
-		history.append(value->getKey().cert);
-	}
-	ui->confirm->setDisabled(rightList.isEmpty());
-	historyCertData.addAndSave(history);
-}
-
-void AddRecipients::addRecipientFromCard()
-{
-	if(auto *item = addRecipientToLeftPane(qApp->signer()->tokenauth().cert()))
-		addRecipientToRightPane(item, true);
-}
 
 void AddRecipients::addRecipientFromFile()
 {
@@ -150,47 +126,52 @@ void AddRecipients::addRecipientFromFile()
 	{
 		WarningDialog::show(this, tr("This certificate cannot be used for encryption"));
 	}
-	else if(auto *item = addRecipientToLeftPane(cert))
-	{
-		addRecipientToRightPane(item, true);
-	}
+	else
+		addRecipient(cert);
 }
 
 void AddRecipients::addRecipientFromHistory()
 {
 	auto *dlg = new CertificateHistory(historyCertData, this);
-	connect(dlg, &CertificateHistory::addSelectedCerts, this, &AddRecipients::addSelectedCerts);
+	connect(dlg, &CertificateHistory::addSelectedCerts, this, [this](const QList<HistoryCertData> &selectedCertData) {
+		if(selectedCertData.isEmpty())
+			return;
+
+		ui->leftPane->clear();
+		for(const HistoryCertData &certData: selectedCertData) {
+			QString term = (certData.type == QStringLiteral("1") || certData.type == QStringLiteral("3")) ? certData.CN : certData.CN.split(',').value(2);
+			search(term, true, certData.type);
+		}
+	});
 	dlg->open();
 }
 
-AddressItem * AddRecipients::addRecipientToLeftPane(const QSslCertificate& cert)
+void AddRecipients::addRecipient(const QSslCertificate& cert, bool select)
 {
-	AddressItem *leftItem = leftList.value(cert);
-	if(leftItem)
-		return leftItem;
-
-	leftItem = new AddressItem(CKey(cert), ui->leftPane);
-	leftList.insert(cert, leftItem);
-	ui->leftPane->addWidget(leftItem);
-	bool contains = rightList.contains(cert);
-	leftItem->setDisabled(contains);
-	leftItem->showButton(contains ? AddressItem::Added : AddressItem::Add);
-
-	connect(leftItem, &AddressItem::add, this, [this](Item *item) {
-		addRecipientToRightPane(qobject_cast<AddressItem*>(item), true);
-	});
-
-	if(auto *add = ui->leftPane->findChild<QWidget*>(QStringLiteral("add")))
-		add->setVisible(true);
+	AddressItem *leftItem = itemListValue(ui->leftPane, cert);
+	if(!leftItem)
+	{
+		leftItem = new AddressItem(cert, ui->leftPane);
+		ui->leftPane->addWidget(leftItem);
+		bool contains = rightList.contains(cert);
+		leftItem->setDisabled(contains);
+		leftItem->showButton(contains ? AddressItem::Added : AddressItem::Add);
+		connect(leftItem, &AddressItem::add, this, [this](Item *item) { addRecipientToRightPane(item); });
+		if(auto *add = ui->leftPane->findChild<QWidget*>(QStringLiteral("add")))
+			add->setVisible(true);
+	}
 
-	return leftItem;
+	if(select)
+		addRecipientToRightPane(leftItem);
 }
 
-bool AddRecipients::addRecipientToRightPane(const CKey &key, bool update)
+void AddRecipients::addRecipientToRightPane(Item *item, bool update)
 {
-	if (rightList.contains(key))
-		return false;
+	auto *address = qobject_cast<AddressItem*>(item);
+	if(!address || rightList.contains(address->getKey()))
+		return;
 
+	const auto &key = address->getKey();
 	if(update)
 	{
 		if(auto expiryDate = key.cert.expiryDate(); expiryDate <= QDateTime::currentDateTime())
@@ -198,7 +179,7 @@ bool AddRecipients::addRecipientToRightPane(const CKey &key, bool update)
 			if(Settings::CDOC2_DEFAULT && Settings::CDOC2_USE_KEYSERVER)
 			{
 				WarningDialog::show(this, tr("Failed to add certificate. An expired certificate cannot be used for encryption."));
-				return false;
+				return;
 			}
 			auto *dlg = new WarningDialog(tr("Are you sure that you want use certificate for encrypting, which expired on %1?<br />"
 				"When decrypter has updated certificates then decrypting is impossible.")
@@ -206,7 +187,7 @@ bool AddRecipients::addRecipientToRightPane(const CKey &key, bool update)
 			dlg->setCancelText(WarningDialog::NO);
 			dlg->addButton(WarningDialog::YES, QMessageBox::Yes);
 			if(dlg->exec() != QMessageBox::Yes)
-				return false;
+				return;
 		}
 		QSslConfiguration backup = QSslConfiguration::defaultConfiguration();
 		QSslConfiguration::setDefaultConfiguration(CheckConnection::sslConfiguration());
@@ -219,7 +200,7 @@ bool AddRecipients::addRecipientToRightPane(const CKey &key, bool update)
 			dlg->setCancelText(WarningDialog::NO);
 			dlg->addButton(WarningDialog::YES, QMessageBox::Yes);
 			if(dlg->exec() != QMessageBox::Yes)
-				return false;
+				return;
 		}
 	}
 	updated = update;
@@ -227,47 +208,45 @@ bool AddRecipients::addRecipientToRightPane(const CKey &key, bool update)
 	rightList.append(key);
 
 	auto *rightItem = new AddressItem(key, ui->rightPane);
-	connect(rightItem, &AddressItem::remove, this, &AddRecipients::removeRecipientFromRightPane);
+	connect(rightItem, &AddressItem::remove, this, [this](Item *item) {
+		auto *rightItem = qobject_cast<AddressItem*>(item);
+		if(auto *leftItem = itemListValue(ui->leftPane, rightItem->getKey().cert))
+		{
+			leftItem->setDisabled(false);
+			leftItem->showButton(AddressItem::Add);
+		}
+		rightList.removeAll(rightItem->getKey());
+		updated = true;
+		ui->confirm->setDisabled(rightList.isEmpty());
+	});
 	ui->rightPane->addWidget(rightItem);
-	ui->confirm->setDisabled(rightList.isEmpty());
-	historyCertData.addAndSave({key.cert});
-	return true;
-}
-
-void AddRecipients::addRecipientToRightPane(AddressItem *leftItem, bool update)
-{
-	if(addRecipientToRightPane(leftItem->getKey(), update)) {
+	ui->confirm->setEnabled(true);
+	historyCertData.addAndSave(key.cert);
+	if(auto *leftItem = itemListValue(ui->leftPane, key))
+	{
 		leftItem->setDisabled(true);
 		leftItem->showButton(AddressItem::Added);
 	}
 }
 
-void AddRecipients::addSelectedCerts(const QList<HistoryCertData>& selectedCertData)
-{
-	if(selectedCertData.isEmpty())
-		return;
-
-	leftList.clear();
-	ui->leftPane->clear();
-	for(const HistoryCertData &certData: selectedCertData) {
-		QString term = (certData.type == QStringLiteral("1") || certData.type == QStringLiteral("3")) ? certData.CN : certData.CN.split(',').value(2);
-		search(term, true, certData.type);
-	}
-}
-
 QString AddRecipients::defaultUrl(QLatin1String key, const QString &defaultValue)
 {
 	return Application::confValue(key).toString(defaultValue);
 }
 
-void AddRecipients::enableRecipientFromCard()
+bool AddRecipients::isUpdated() const
 {
-	ui->fromCard->setDisabled( qApp->signer()->tokenauth().cert().isNull() );
+	return updated;
 }
 
-bool AddRecipients::isUpdated() const
+AddressItem* AddRecipients::itemListValue(ItemList *list, const CKey &cert)
 {
-	return updated;
+	for(auto *item: list->items)
+	{
+		if(auto *address = qobject_cast<AddressItem*>(item); address && address->getKey() == cert)
+			return address;
+	}
+	return nullptr;
 }
 
 QList<CKey> AddRecipients::keys()
@@ -281,24 +260,9 @@ QList<CKey> AddRecipients::keys()
 	return recipients;
 }
 
-void AddRecipients::removeRecipientFromRightPane(Item *toRemove)
-{
-	auto *rightItem = qobject_cast<AddressItem*>(toRemove);
-	if(auto it = leftList.find(rightItem->getKey().cert); it != leftList.end())
-	{
-		it.value()->setDisabled(false);
-		it.value()->showButton(AddressItem::Add);
-	}
-	rightList.removeAll(rightItem->getKey());
-	updated = true;
-	ui->confirm->setDisabled(rightList.isEmpty());
-}
-
 void AddRecipients::search(const QString &term, bool select, const QString &type)
 {
 	QApplication::setOverrideCursor(Qt::WaitCursor);
-	ui->confirm->setDefault(false);
-	ui->confirm->setAutoDefault(false);
 
 	QVariantMap userData {
 		{QStringLiteral("type"), type},
@@ -318,25 +282,19 @@ void AddRecipients::search(const QString &term, bool select, const QString &type
 #endif
 	bool isDigit = false;
 	void(cleanTerm.toULongLong(&isDigit));
-	if(isDigit && (cleanTerm.size() == 11 || cleanTerm.size() == 8))
+	if(!isDigit || (cleanTerm.size() != 11 && cleanTerm.size() != 8))
+		ldap_corp->search(QStringLiteral("(cn=*%1*)").arg(cleanTerm), userData);
+	else if(cleanTerm.size() == 8)
+		ldap_corp->search(QStringLiteral("(serialNumber=%1)" ).arg(cleanTerm), userData);
+	else if(IKValidator::isValid(cleanTerm))
 	{
-		if(cleanTerm.size() == 11)
-		{
-			if(!IKValidator::isValid(cleanTerm))
-			{
-				QApplication::restoreOverrideCursor();
-				WarningDialog::show(this, tr("Personal code is not valid!"));
-				return;
-			}
-			userData[QStringLiteral("personSearch")] = true;
-			ldap_person->search(QStringLiteral("(serialNumber=%1%2)" ).arg(ldap_person->isSSL() ? QStringLiteral("PNOEE-") : QString(), cleanTerm), userData);
-		}
-		else
-			ldap_corp->search(QStringLiteral("(serialNumber=%1)" ).arg(cleanTerm), userData);
+		userData[QStringLiteral("personSearch")] = true;
+		ldap_person->search(QStringLiteral("(serialNumber=%1%2)" ).arg(ldap_person->isSSL() ? QStringLiteral("PNOEE-") : QString(), cleanTerm), userData);
 	}
 	else
 	{
-		ldap_corp->search(QStringLiteral("(cn=*%1*)").arg(cleanTerm), userData);
+		QApplication::restoreOverrideCursor();
+		WarningDialog::show(this, tr("Personal code is not valid!"));
 	}
 }
 
@@ -348,7 +306,6 @@ void AddRecipients::showError( const QString &msg, const QString &details )
 
 void AddRecipients::showResult(const QList<QSslCertificate> &result, int resultCount, const QVariantMap &userData)
 {
-	bool isEmpty = true;
 	for(const QSslCertificate &k: result)
 	{
 		SslCertificate c(k);
@@ -358,16 +315,13 @@ void AddRecipients::showResult(const QList<QSslCertificate> &result, int resultC
 			(userData.value(QStringLiteral("personSearch"), false).toBool() || !c.enhancedKeyUsage().contains(SslCertificate::ClientAuth)) &&
 			c.type() != SslCertificate::MobileIDType)
 		{
-			isEmpty = false;
-			AddressItem *item = addRecipientToLeftPane(k);
-			if(userData.value(QStringLiteral("select"), false).toBool() &&
-				(userData.value(QStringLiteral("type")).isNull() || HistoryCertData::toType(SslCertificate(k)) == userData[QStringLiteral("type")]))
-				addRecipientToRightPane(item, true);
+			addRecipient(k, userData.value(QStringLiteral("select"), false).toBool() &&
+				(userData.value(QStringLiteral("type")).isNull() || HistoryCertData::toType(SslCertificate(k)) == userData[QStringLiteral("type")]));
 		}
 	}
 	if(resultCount >= 50)
 		showError(tr("The name you were looking for gave too many results, please refine your search."));
-	else if(isEmpty)
+	else if(ui->leftPane->items.isEmpty())
 	{
 		showError(tr("Person or company does not own a valid certificate.<br />"
 			"It is necessary to have a valid certificate for encryption.<br />"
diff --git a/client/dialogs/AddRecipients.h b/client/dialogs/AddRecipients.h
index 4f9e5d2d6..0c9fb0013 100644
--- a/client/dialogs/AddRecipients.h
+++ b/client/dialogs/AddRecipients.h
@@ -45,17 +45,12 @@ class AddRecipients final : public QDialog
 	bool isUpdated() const;
 
 private:
-	void addAllRecipientToRightPane();
-	void addRecipientFromCard();
 	void addRecipientFromFile();
 	void addRecipientFromHistory();
-	AddressItem * addRecipientToLeftPane(const QSslCertificate& cert);
-	bool addRecipientToRightPane(const CKey &key, bool update = true);
-	void addRecipientToRightPane(AddressItem *leftItem, bool update = true);
-	void addSelectedCerts(const QList<HistoryCertData>& selectedCertData);
-	void enableRecipientFromCard();
-	void removeRecipientFromRightPane(Item *toRemove);
+	void addRecipient(const QSslCertificate& cert, bool select = true);
+	void addRecipientToRightPane(Item *item, bool update = true);
 
+	AddressItem* itemListValue(ItemList *list, const CKey &cert);
 	void search(const QString &term, bool select = false, const QString &type = {});
 	void showError(const QString &msg, const QString &details = {});
 	void showResult(const QList<QSslCertificate> &result, int resultCount, const QVariantMap &userData);
@@ -63,7 +58,6 @@ class AddRecipients final : public QDialog
 	static QString defaultUrl(QLatin1String key, const QString &defaultValue);
 
 	Ui::AddRecipients *ui;
-	QHash<QSslCertificate, AddressItem *> leftList;
 	QList<CKey> rightList;
 	LdapSearch *ldap_person, *ldap_corp;
 	bool updated = false;
diff --git a/client/dialogs/AddRecipients.ui b/client/dialogs/AddRecipients.ui
index 66fa94fe2..9eeda816b 100644
--- a/client/dialogs/AddRecipients.ui
+++ b/client/dialogs/AddRecipients.ui
@@ -21,25 +21,18 @@
   </property>
   <property name="styleSheet">
    <string notr="true">QWidget {
-color: #000000;
+color: #07142A;
+font-family: Roboto, Helvetica;
+font-size: 14px;
 }
 #leftPane, #rightPane {
 background-color: #ffffff;
 }
 #leftPane {
-border: solid #D9D9D8;
-border-width: 0px 1px 0px 0px;
-}
-#navigationArea {
-background-color: #f7f7f7;
-border: 1px solid #c8c8c8;
-border-width: 1px 0px 0px 0px;
+border-right: 1px solid #E7EAEF;
 }</string>
   </property>
-  <layout class="QVBoxLayout" name="AddRecipientsLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
+  <layout class="QGridLayout" name="AddRecipientsLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -52,83 +45,95 @@ border-width: 1px 0px 0px 0px;
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item>
-    <layout class="QHBoxLayout" name="containerListsLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="ItemList" name="leftPane"/>
-     </item>
-     <item>
-      <widget class="ItemList" name="rightPane"/>
-     </item>
-    </layout>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="ItemList" name="leftPane"/>
+   </item>
+   <item row="0" column="1">
+    <widget class="ItemList" name="rightPane"/>
    </item>
-   <item>
+   <item row="1" column="0" colspan="2">
     <widget class="QWidget" name="navigationArea" native="true">
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>40</height>
+       <height>48</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>16777215</width>
-       <height>40</height>
+       <height>48</height>
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #006EB5;
+      <string notr="true">#navigationArea {
+border-top: 1px solid #E7EAEF;
+background-color: #F3F5F7;
 }
-QPushButton:pressed {
-	color: #FFFFFF;
-	background-color: #006EB5;
+QPushButton {
+padding: 10px 12px;
+border: 1px solid transparent;
+border-radius: 4px;
+color: #2F70B6;
+font-size: 12px;
+font-weight: 700;
+}
+QPushButton:hover {
+background-color: #EAF1F8;
 }
-QPushButton:hover:!pressed {
-	border: 1px solid #006EB5;
-	color: #006EB5;
+QPushButton:pressed {
+background-color: #BFD3E8;
 }
 QPushButton:disabled {
-	color: #727679;
+color: #82A9D3;
+}
+QPushButton:default {
+color: #ffffff;
+border-color: #2F70B6;
+background-color: #2F70B6;
+}
+QPushButton:default:hover {
+border-color: #2B66A6;
+background-color: #2B66A6;
+}
+QPushButton:default:pressed {
+border-color: #215081;
+background-color: #215081;
+}
+QPushButton:default:disabled {
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
      </property>
      <layout class="QHBoxLayout" name="navigationAreaLayout" stretch="0,0,0,1,0">
       <property name="spacing">
-       <number>15</number>
+       <number>16</number>
       </property>
       <property name="leftMargin">
-       <number>20</number>
+       <number>24</number>
       </property>
       <property name="topMargin">
-       <number>7</number>
+       <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>15</number>
+       <number>24</number>
       </property>
       <property name="bottomMargin">
-       <number>8</number>
+       <number>0</number>
       </property>
       <item>
        <widget class="QPushButton" name="fromCard">
-        <property name="minimumSize">
-         <size>
-          <width>145</width>
-          <height>25</height>
-         </size>
+        <property name="enabled">
+         <bool>false</bool>
         </property>
         <property name="cursor">
          <cursorShape>PointingHandCursor</cursorShape>
         </property>
-        <property name="accessibleName">
-         <string extracomment="accessible">Certificate from card</string>
-        </property>
         <property name="text">
-         <string>CERTIFICATE FROM CARD</string>
+         <string>Certificate from card</string>
         </property>
         <property name="autoDefault">
          <bool>false</bool>
@@ -137,20 +142,11 @@ QPushButton:disabled {
       </item>
       <item>
        <widget class="QPushButton" name="fromFile">
-        <property name="minimumSize">
-         <size>
-          <width>134</width>
-          <height>25</height>
-         </size>
-        </property>
         <property name="cursor">
          <cursorShape>PointingHandCursor</cursorShape>
         </property>
-        <property name="accessibleName">
-         <string extracomment="accessible">Certificate from file</string>
-        </property>
         <property name="text">
-         <string>CERTIFICATE FROM FILE</string>
+         <string>Certificate from file</string>
         </property>
         <property name="autoDefault">
          <bool>false</bool>
@@ -159,20 +155,11 @@ QPushButton:disabled {
       </item>
       <item>
        <widget class="QPushButton" name="fromHistory">
-        <property name="minimumSize">
-         <size>
-          <width>145</width>
-          <height>25</height>
-         </size>
-        </property>
         <property name="cursor">
          <cursorShape>PointingHandCursor</cursorShape>
         </property>
-        <property name="accessibleName">
-         <string extracomment="accessible">Latest used certificate</string>
-        </property>
         <property name="text">
-         <string>LATEST USED CERTIFICATE</string>
+         <string>Latest used certificate</string>
         </property>
         <property name="autoDefault">
          <bool>false</bool>
@@ -195,38 +182,27 @@ QPushButton:disabled {
       <item>
        <layout class="QHBoxLayout" name="actionLayout">
         <property name="spacing">
-         <number>2</number>
+         <number>16</number>
         </property>
         <item>
          <widget class="QPushButton" name="cancel">
-          <property name="minimumSize">
-           <size>
-            <width>120</width>
-            <height>25</height>
-           </size>
-          </property>
           <property name="cursor">
            <cursorShape>PointingHandCursor</cursorShape>
           </property>
-          <property name="accessibleName">
-           <string extracomment="accessible">Cancel</string>
-          </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #981E32;
+border: 1px solid #AD2A45;
+color: #AD2A45;
 }
-QPushButton:pressed {
-	background-color: #F24A66;
+QPushButton:hover {
+background-color: #F5EBED;
 }
-QPushButton:hover:!pressed {
-	background-color: #CD2541;
+QPushButton:pressed {
+background-color: #E1C1C6;
 }</string>
           </property>
           <property name="text">
-           <string>CANCEL</string>
+           <string>Cancel</string>
           </property>
           <property name="autoDefault">
            <bool>false</bool>
@@ -235,37 +211,14 @@ QPushButton:hover:!pressed {
         </item>
         <item>
          <widget class="QPushButton" name="confirm">
-          <property name="minimumSize">
-           <size>
-            <width>120</width>
-            <height>25</height>
-           </size>
+          <property name="enabled">
+           <bool>false</bool>
           </property>
           <property name="cursor">
            <cursorShape>PointingHandCursor</cursorShape>
           </property>
-          <property name="accessibleName">
-           <string extracomment="accessible">Confirm</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #006EB5;
-}
-QPushButton:pressed {
-	background-color: #41B6E6;
-}
-QPushButton:hover:!pressed {
-	background-color: #008DCF;
-}
-QPushButton:disabled {
-	background-color: #BEDBED;
-}</string>
-          </property>
           <property name="text">
-           <string>CONFIRM</string>
+           <string>Confirm</string>
           </property>
           <property name="default">
            <bool>true</bool>
@@ -287,13 +240,6 @@ QPushButton:disabled {
    <container>1</container>
   </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>fromCard</tabstop>
-  <tabstop>fromFile</tabstop>
-  <tabstop>fromHistory</tabstop>
-  <tabstop>cancel</tabstop>
-  <tabstop>confirm</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/client/dialogs/CertificateDetails.cpp b/client/dialogs/CertificateDetails.cpp
index daf595f64..ea7d91f0f 100644
--- a/client/dialogs/CertificateDetails.cpp
+++ b/client/dialogs/CertificateDetails.cpp
@@ -23,7 +23,6 @@
 
 #include "Application.h"
 #include "DateTime.h"
-#include "Styles.h"
 #include "SslCertificate.h"
 #include "effects/Overlay.h"
 #include "dialogs/WarningDialog.h"
@@ -34,13 +33,12 @@
 #include <QtGui/QDesktopServices>
 #include <QtNetwork/QSslKey>
 #include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMessageBox>
 
 CertificateDetails::CertificateDetails(const SslCertificate &cert, QWidget *parent)
 	: QDialog(parent)
-	, ui(new Ui::CertificateDetails)
 {
-	ui->setupUi(this);
+	Ui::CertificateDetails ui;
+	ui.setupUi(this);
 #ifdef Q_OS_MAC
 	setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::Sheet);
 #else
@@ -48,23 +46,6 @@ CertificateDetails::CertificateDetails(const SslCertificate &cert, QWidget *pare
 #endif
 	new Overlay(this);
 
-	QFont headerFont = Styles::font( Styles::Regular, 18 );
-	QFont regularFont = Styles::font( Styles::Regular, 14 );
-	QFont smallFont = Styles::font(Styles::Regular, 13);
-
-	ui->lblCertHeader->setFont(headerFont);
-	ui->lblCertDetails->setFont(headerFont);
-
-	ui->lblCertInfo->setFont(regularFont);
-	ui->tblDetails->setFont(smallFont);
-	ui->detailedValue->setFont(smallFont);
-
-	QFont condensed14 = Styles::font(Styles::Condensed, 14);
-	ui->close->setFont(condensed14);
-	ui->save->setFont(condensed14);
-
-	ui->lblCertHeader->setText(tr("Certificate information"));
-
 	QString i;
 	QTextStream s( &i );
 	s << "<b>" << tr("This certificate is intended for following purpose(s):") << "</b>";
@@ -80,10 +61,9 @@ CertificateDetails::CertificateDetails(const SslCertificate &cert, QWidget *pare
 	s << "<b>" << tr("Valid:") << "</b><br />";
 	s << "<b>" << tr("From") << "</b> " << cert.effectiveDate().toLocalTime().toString(QStringLiteral("dd.MM.yyyy")) << "<br />";
 	s << "<b>" << tr("To") << "</b> " << cert.expiryDate().toLocalTime().toString(QStringLiteral("dd.MM.yyyy"));
-	ui->lblCertInfo->setHtml( i );
+	ui.lblCertInfo->setHtml( i );
 
-
-	connect(ui->save, &QPushButton::clicked, this, [this, cert] {
+	connect(ui.save, &QPushButton::clicked, this, [this, cert] {
 		QString file = QFileDialog::getSaveFileName(this, tr("Save certificate"), QStringLiteral("%1%2%3.cer")
 				.arg(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation))
 				.arg(QDir::separator())
@@ -97,26 +77,25 @@ CertificateDetails::CertificateDetails(const SslCertificate &cert, QWidget *pare
 		else
 			WarningDialog::show(this, tr("Failed to save file"));
 	});
-	connect( ui->close, &QPushButton::clicked, this, &CertificateDetails::accept );
+	connect(ui.close, &QPushButton::clicked, this, &CertificateDetails::accept);
 	connect( this, &CertificateDetails::finished, this, &CertificateDetails::close );
-	connect(ui->tblDetails, &QTableWidget::itemSelectionChanged, this, [this] {
-		const QList<QTableWidgetItem*> &list = ui->tblDetails->selectedItems();
+	connect(ui.tblDetails, &QTableWidget::itemSelectionChanged, this, [detailedValue = ui.detailedValue, tblDetails = ui.tblDetails] {
+		const QList<QTableWidgetItem*> &list = tblDetails->selectedItems();
 		if(list.isEmpty())
 			return;
 		auto *contentItem = list.last();
 		auto userData = contentItem->data(Qt::UserRole);
-		ui->detailedValue->setPlainText(userData.isNull() ?
+		detailedValue->setPlainText(userData.isNull() ?
 			contentItem->data(Qt::DisplayRole).toString() : userData.toString());
 	});
 
-	ui->tblDetails->setHorizontalHeaderLabels({ tr("Field"), tr("Value") });
-	auto addItem = [this](const QString &variable, const QString &value, const QVariant &valueext = {}) {
-		int row = ui->tblDetails->model()->rowCount();
-		ui->tblDetails->setRowCount(row + 1);
+	auto addItem = [tblDetails = ui.tblDetails](const QString &variable, const QString &value, const QVariant &valueext = {}) {
+		int row = tblDetails->model()->rowCount();
+		tblDetails->setRowCount(row + 1);
 		auto *item = new QTableWidgetItem(value);
 		item->setData(Qt::UserRole, valueext);
-		ui->tblDetails->setItem(row, 0, new QTableWidgetItem(variable));
-		ui->tblDetails->setItem(row, 1, item);
+		tblDetails->setItem(row, 0, new QTableWidgetItem(variable));
+		tblDetails->setItem(row, 1, item);
 	};
 
 	addItem(tr("Version"), QString("V" + cert.version()));
@@ -150,36 +129,31 @@ CertificateDetails::CertificateDetails(const SslCertificate &cert, QWidget *pare
 		textExt << QStringLiteral("%1 = %2").arg(obj.constData(), data);
 	}
 	addItem(tr("Subject"), text.join(QStringLiteral(", ")), textExt.join('\n'));
-	addItem(tr("Public key"), cert.keyName(), cert.toHex(cert.publicKey().toDer()));
+	addItem(tr("Public key"), cert.keyName(), cert.publicKey().toDer().toHex(' ').toUpper());
 	QStringList enhancedKeyUsage = cert.enhancedKeyUsage().values();
 	if( !enhancedKeyUsage.isEmpty() )
 		addItem(tr("Enhanced key usage"), enhancedKeyUsage.join(QStringLiteral(", ")), enhancedKeyUsage.join('\n'));
 	QStringList policies = cert.policies();
 	if( !policies.isEmpty() )
 		addItem(tr("Certificate policies"), policies.join(QStringLiteral(", ")));
-	addItem(tr("Authority key identifier"), cert.toHex(cert.authorityKeyIdentifier()));
-	addItem(tr("Subject key identifier"), cert.toHex(cert.subjectKeyIdentifier()));
+	addItem(tr("Authority key identifier"), cert.authorityKeyIdentifier().toHex(' ').toUpper());
+	addItem(tr("Subject key identifier"), cert.subjectKeyIdentifier().toHex(' ').toUpper());
 	QStringList keyUsage = cert.keyUsage().values();
 	if( !keyUsage.isEmpty() )
 		addItem(tr("Key usage"), keyUsage.join(QStringLiteral(", ")), keyUsage.join('\n'));
 
 	// Disable resizing
-	ui->tblDetails->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-}
-
-CertificateDetails::~CertificateDetails()
-{
-	delete ui;
+	ui.tblDetails->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
 }
 
 #ifndef Q_OS_MAC
-void CertificateDetails::showCertificate(const SslCertificate &cert, QWidget *parent, const QString &suffix)
+void CertificateDetails::showCertificate(const QSslCertificate &cert, QWidget *parent, const QString &suffix)
 {
 #ifdef Q_OS_UNIX
 	CertificateDetails(cert, parent).exec();
 #else
 	Q_UNUSED(parent);
-	QString name = cert.subjectInfo("serialNumber");
+	QString name = cert.subjectInfo("serialNumber").join('_');
 	if(name.isEmpty())
 		name = cert.serialNumber().replace(':', "");
 	QString path = QStringLiteral("%1/%2%3.cer").arg(QDir::tempPath(), name, suffix);
diff --git a/client/dialogs/CertificateDetails.h b/client/dialogs/CertificateDetails.h
index f28360883..23bda8dff 100644
--- a/client/dialogs/CertificateDetails.h
+++ b/client/dialogs/CertificateDetails.h
@@ -21,8 +21,8 @@
 
 #include <QDialog>
 
-namespace Ui { class CertificateDetails; }
 class SslCertificate;
+class QSslCertificate;
 
 class CertificateDetails final : public QDialog
 {
@@ -30,10 +30,6 @@ class CertificateDetails final : public QDialog
 
 public:
 	explicit CertificateDetails(const SslCertificate &c, QWidget *parent = nullptr);
-	~CertificateDetails() final;
 
-	static void showCertificate(const SslCertificate &cert, QWidget *parent, const QString &suffix = {});
-
-private:
-	Ui::CertificateDetails *ui;
+	static void showCertificate(const QSslCertificate &cert, QWidget *parent, const QString &suffix = {});
 };
diff --git a/client/dialogs/CertificateDetails.ui b/client/dialogs/CertificateDetails.ui
index df95e54d7..8ad8de743 100644
--- a/client/dialogs/CertificateDetails.ui
+++ b/client/dialogs/CertificateDetails.ui
@@ -13,34 +13,24 @@
     <height>570</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>994</width>
-    <height>570</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
   <property name="styleSheet">
    <string notr="true">QWidget {
-	color: #000000;
-	background-color: #FFFFFF
+font-family: Roboto, Helvetica;
+font-size: 14px;
+}
+#CertificateDetails {
+background-color: #FFFFFF;
+border-radius: 4px;
+}
+#leftPane {
+border-right: 1px solid #E7EAEF;
+}
+#lblCertHeader, #lblCertDetails {
+color: #003168;
+font-size: 22px;
 }</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
+  <layout class="QGridLayout" name="CertificateDetailsLayout" columnstretch="0,1">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -53,416 +43,263 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item>
-    <widget class="QWidget" name="containerLists" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>1</horstretch>
-       <verstretch>1</verstretch>
-      </sizepolicy>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="leftPaneLayout">
+     <property name="spacing">
+      <number>24</number>
+     </property>
+     <property name="leftMargin">
+      <number>24</number>
+     </property>
+     <property name="topMargin">
+      <number>32</number>
+     </property>
+     <property name="rightMargin">
+      <number>24</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="lblCertHeader">
+       <property name="text">
+        <string>Certificate information</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="lblCertInfo">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="1">
+    <layout class="QVBoxLayout" name="pageLayout">
+     <property name="spacing">
+      <number>24</number>
+     </property>
+     <property name="leftMargin">
+      <number>24</number>
      </property>
+     <property name="topMargin">
+      <number>32</number>
+     </property>
+     <property name="rightMargin">
+      <number>24</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="lblCertDetails">
+       <property name="text">
+        <string>Certificate details</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTableWidget" name="tblDetails">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>320</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QHeaderView::section {
+border: 1px solid #E7EAEF;
+border-width: 0px 0px 1px 0px;
+padding: 0px 0px 8px 5px;
+background-color: #FFFFFF;
+}</string>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+       <property name="showGrid">
+        <bool>false</bool>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+       <attribute name="horizontalHeaderVisible">
+        <bool>true</bool>
+       </attribute>
+       <attribute name="horizontalHeaderMinimumSectionSize">
+        <number>26</number>
+       </attribute>
+       <attribute name="horizontalHeaderDefaultSectionSize">
+        <number>140</number>
+       </attribute>
+       <attribute name="horizontalHeaderStretchLastSection">
+        <bool>true</bool>
+       </attribute>
+       <attribute name="verticalHeaderVisible">
+        <bool>false</bool>
+       </attribute>
+       <attribute name="verticalHeaderMinimumSectionSize">
+        <number>20</number>
+       </attribute>
+       <attribute name="verticalHeaderDefaultSectionSize">
+        <number>20</number>
+       </attribute>
+       <column>
+        <property name="text">
+         <string>Field</string>
+        </property>
+        <property name="textAlignment">
+         <set>AlignLeading|AlignVCenter</set>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Value</string>
+        </property>
+        <property name="textAlignment">
+         <set>AlignLeading|AlignVCenter</set>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="detailedValue">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QWidget" name="navigationArea" native="true">
      <property name="minimumSize">
       <size>
-       <width>880</width>
-       <height>399</height>
+       <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">background-color: #ffffff;</string>
+      <string notr="true">#navigationArea {
+border-top: 1px solid #E7EAEF;
+background-color: #F3F5F7;
+}
+QPushButton {
+padding: 10px 12px;
+border: 1px solid #2F70B6;
+border-radius: 4px;
+color: #ffffff;
+background-color: #2F70B6;
+font-size: 12px;
+font-weight: 700;
+}
+QPushButton:hover {
+border-color: #2B66A6;
+background-color: #2B66A6;
+}
+QPushButton:pressed {
+border-color: #215081;
+background-color: #215081;
+}
+QPushButton:disabled {
+border-color: #82A9D3;
+background-color: #82A9D3;
+}
+QPushButton:default {
+background-color: transparent;
+border-color: #AD2A45;
+color: #AD2A45;
+}
+QPushButton:default:hover {
+background-color: #F5EBED;
+}
+QPushButton:default:pressed {
+background-color: #E1C1C6;
+}</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <layout class="QHBoxLayout" name="navigationAreaLayout">
       <property name="spacing">
-       <number>0</number>
+       <number>16</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>24</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>24</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
-       <widget class="QWidget" name="leftPane" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+       <spacer name="navigationAreaSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="minimumSize">
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>300</width>
-          <height>0</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>300</width>
-          <height>16777215</height>
-         </size>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="close">
+        <property name="text">
+         <string>Close</string>
         </property>
-        <property name="styleSheet">
-         <string notr="true">border-right: 1px solid #DEE4E9;</string>
+        <property name="default">
+         <bool>true</bool>
         </property>
-        <widget class="QLabel" name="lblCertHeader">
-         <property name="geometry">
-          <rect>
-           <x>21</x>
-           <y>20</y>
-           <width>278</width>
-           <height>21</height>
-          </rect>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>278</width>
-           <height>21</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>278</width>
-           <height>21</height>
-          </size>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">border: none;</string>
-         </property>
-         <property name="text">
-          <string>Certificate information</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-        <widget class="QTextEdit" name="lblCertInfo">
-         <property name="geometry">
-          <rect>
-           <x>21</x>
-           <y>53</y>
-           <width>250</width>
-           <height>470</height>
-          </rect>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>250</width>
-           <height>470</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>250</width>
-           <height>470</height>
-          </size>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">border: none;
-span {
-  line-height: 1.5;
-}</string>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
        </widget>
       </item>
       <item>
-       <widget class="QWidget" name="page" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+       <widget class="QPushButton" name="save">
+        <property name="text">
+         <string>Save</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+        <property name="default">
+         <bool>false</bool>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="topMargin">
-          <number>3</number>
-         </property>
-         <property name="bottomMargin">
-          <number>3</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="lblCertDetails">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>652</width>
-             <height>38</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>652</width>
-             <height>38</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">border: none;</string>
-           </property>
-           <property name="text">
-            <string>Certificate details</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="tblDetails">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>320</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>360</height>
-            </size>
-           </property>
-           <property name="font">
-            <font>
-             <pointsize>13</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">#tblDetails {
-	border:none;
-}
-QHeaderView::section {
-	border: 1px solid #D9D9D8;
-	border-width: 0px 1px 1px 0px;
-	text-align: center;
-	padding: 2px 0px 3px 0px;
-	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-                                      stop:0 #FFFFFF, stop:1 #FFFFFF);
-}
-</string>
-           </property>
-           <property name="editTriggers">
-            <set>QAbstractItemView::NoEditTriggers</set>
-           </property>
-           <property name="selectionMode">
-            <enum>QAbstractItemView::SingleSelection</enum>
-           </property>
-           <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="rowCount">
-            <number>0</number>
-           </property>
-           <property name="columnCount">
-            <number>2</number>
-           </property>
-           <attribute name="horizontalHeaderVisible">
-            <bool>true</bool>
-           </attribute>
-           <attribute name="horizontalHeaderMinimumSectionSize">
-            <number>19</number>
-           </attribute>
-           <attribute name="horizontalHeaderDefaultSectionSize">
-            <number>140</number>
-           </attribute>
-           <attribute name="horizontalHeaderStretchLastSection">
-            <bool>true</bool>
-           </attribute>
-           <attribute name="verticalHeaderVisible">
-            <bool>false</bool>
-           </attribute>
-           <attribute name="verticalHeaderMinimumSectionSize">
-            <number>14</number>
-           </attribute>
-           <attribute name="verticalHeaderDefaultSectionSize">
-            <number>23</number>
-           </attribute>
-           <column/>
-           <column/>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTextEdit" name="detailedValue">
-           <property name="styleSheet">
-            <string notr="true">border: none;</string>
-           </property>
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QWidget" name="navigationArea" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>1</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>40</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>40</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">border-top: 1px solid #DEE4E9;
-background-color: #f7f7f7;</string>
-     </property>
-     <widget class="QPushButton" name="close">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="geometry">
-       <rect>
-        <x>720</x>
-        <y>8</y>
-        <width>120</width>
-        <height>25</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>120</width>
-        <height>25</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>120</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="accessibleName">
-       <string extracomment="accessible">Close</string>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #981E32;
-}
-QPushButton:pressed {
-	background-color: #F24A66;
-}
-QPushButton:hover:!pressed {
-	background-color: #CD2541;
-}
-QPushButton:disabled {
-	background-color: #BEDBED;
-}</string>
-      </property>
-      <property name="text">
-       <string>CLOSE</string>
-      </property>
-      <property name="autoDefault">
-       <bool>false</bool>
-      </property>
-      <property name="default">
-       <bool>true</bool>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="save">
-      <property name="geometry">
-       <rect>
-        <x>854</x>
-        <y>8</y>
-        <width>120</width>
-        <height>25</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>120</width>
-        <height>25</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>120</width>
-        <height>25</height>
-       </size>
-      </property>
-      <property name="accessibleName">
-       <string extracomment="accessible">Save</string>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #006EB5;
-}
-QPushButton:pressed {
-	background-color: #41B6E6;
-}
-QPushButton:hover:!pressed {
-	background-color: #008DCF;
-}
-QPushButton:disabled {
-	background-color: #BEDBED;
-}</string>
-      </property>
-      <property name="text">
-       <string>SAVE</string>
-      </property>
-      <property name="autoDefault">
-       <bool>false</bool>
-      </property>
-     </widget>
-    </widget>
-   </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>lblCertInfo</tabstop>
-  <tabstop>tblDetails</tabstop>
-  <tabstop>detailedValue</tabstop>
-  <tabstop>save</tabstop>
-  <tabstop>close</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/client/dialogs/CertificateDetails_mac.mm b/client/dialogs/CertificateDetails_mac.mm
index b54f3de1a..b211fe164 100644
--- a/client/dialogs/CertificateDetails_mac.mm
+++ b/client/dialogs/CertificateDetails_mac.mm
@@ -24,44 +24,15 @@
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QUrl>
-#include <QtWidgets/QWidget>
 
-#import <objc/runtime.h>
-#import <Quartz/Quartz.h>
+#import <QuickLookUI/QuickLookUI.h>
 
-@interface CertPreview : NSResponder <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
+@interface CertPreview : NSResponder <QLPreviewPanelDataSource>
 @property (nonatomic, copy) NSURL *certUrl;
 @end
 
 @implementation CertPreview
 
-- (BOOL)acceptsFirstResponder
-{
-	return YES;
-}
-
-- (BOOL)acceptsPreviewPanelControl:(QLPreviewPanel *)panel
-{
-	Q_UNUSED(panel)
-	return YES;
-}
-
-- (void)beginPreviewPanelControl:(QLPreviewPanel *)panel
-{
-	Q_UNUSED(panel)
-	panel.dataSource = self;
-	panel.delegate = self;
-}
-
-- (void)endPreviewPanelControl:(QLPreviewPanel *)panel
-{
-	Q_UNUSED(panel)
-	QFile::remove(QUrl::fromNSURL(self.certUrl).toLocalFile());
-	panel.dataSource = nil;
-	panel.delegate = nil;
-	self.certUrl = nil;
-}
-
 - (NSInteger)numberOfPreviewItemsInPreviewPanel:(QLPreviewPanel *)panel
 {
 	return 1;
@@ -76,32 +47,31 @@ - (NSInteger)numberOfPreviewItemsInPreviewPanel:(QLPreviewPanel *)panel
 @end
 
 
-void CertificateDetails::showCertificate(const SslCertificate &cert, QWidget *parent, const QString &suffix)
+void CertificateDetails::showCertificate(const QSslCertificate &cert, QWidget *parent, const QString &suffix)
 {
-	QString name = cert.subjectInfo("serialNumber");
+	QString name = cert.subjectInfo("serialNumber").join('_');
 	if(name.isNull() || name.isEmpty())
 		name = QString::fromUtf8(cert.serialNumber());
 	QString path = QStringLiteral("%1/%2%3.cer").arg(QDir::tempPath(), name, suffix);
-	QFile f(path);
-	if(f.open(QIODevice::WriteOnly))
-		f.write(cert.toPem());
-	f.close();
 
 	static CertPreview *cp;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
 		cp = [CertPreview new];
 	});
-	
+
 	if(cp.certUrl != nullptr)
 		QFile::remove(QUrl::fromNSURL(cp.certUrl).toLocalFile());
-
+	if(QFile f(path); f.open(QIODevice::WriteOnly))
+		f.write(cert.toPem());
 	cp.certUrl = [NSURL fileURLWithPath:path.toNSString()];
-	[[(__bridge NSView *)reinterpret_cast<void *>(parent->winId()) window] makeFirstResponder:cp];
-	
+
 	auto qlPanel = QLPreviewPanel.sharedPreviewPanel;
 	if (qlPanel.isVisible)
 		[qlPanel reloadData];
 	else
-		[qlPanel makeKeyAndOrderFront:cp];
+	{
+		qlPanel.dataSource = cp;
+		[qlPanel makeKeyAndOrderFront:nil];
+	}
 }
diff --git a/client/dialogs/CertificateHistory.cpp b/client/dialogs/CertificateHistory.cpp
index b7c84adba..7fea7ec0f 100644
--- a/client/dialogs/CertificateHistory.cpp
+++ b/client/dialogs/CertificateHistory.cpp
@@ -21,7 +21,6 @@
 #include "ui_CertificateHistory.h"
 
 #include "Application.h"
-#include "Styles.h"
 #include "SslCertificate.h"
 
 #include <QtCore/QDir>
@@ -92,28 +91,20 @@ HistoryList::HistoryList()
 	}
 }
 
-void HistoryList::addAndSave(const QList<SslCertificate> &data)
+void HistoryList::addAndSave(const SslCertificate &cert)
 {
-	if(data.isEmpty())
+	if(cert.isNull())
 		return;
-	bool changed = false;
-	for(const auto &cert: data)
-	{
-		if(cert.isNull())
-			continue;
-		HistoryCertData certData{
-			cert.subjectInfo("CN"),
-			HistoryCertData::toType(cert),
-			cert.issuerInfo("CN"),
-			cert.expiryDate().toLocalTime().toString(QStringLiteral("dd.MM.yyyy")),
-		};
-		if(contains(certData))
-			continue;
-		append(std::move(certData));
-		changed = true;
-	}
-	if(changed)
-		save();
+	HistoryCertData certData{
+		cert.subjectInfo("CN"),
+		HistoryCertData::toType(cert),
+		cert.issuerInfo("CN"),
+		cert.expiryDate().toLocalTime().toString(QStringLiteral("dd.MM.yyyy")),
+	};
+	if(contains(certData))
+		return;
+	append(std::move(certData));
+	save();
 }
 
 void HistoryList::removeAndSave(const QList<HistoryCertData> &data)
@@ -164,14 +155,6 @@ CertificateHistory::CertificateHistory(HistoryList &_historyCertData, QWidget *p
 	setMinimumSize(parent->frameSize());
 	move(parent->frameGeometry().center() - frameGeometry().center());
 
-	QFont condensed = Styles::font(Styles::Condensed, 12);
-	QFont regular = Styles::font(Styles::Regular, 14);
-	ui->view->header()->setFont(regular);
-	ui->view->setFont(regular);
-	ui->close->setFont(condensed);
-	ui->select->setFont(condensed);
-	ui->remove->setFont(condensed);
-
 	connect(ui->view->selectionModel(), &QItemSelectionModel::selectionChanged, ui->remove, [this] {
 		ui->select->setDisabled(ui->view->selectedItems().isEmpty());
 		ui->remove->setDisabled(ui->view->selectedItems().isEmpty());
@@ -193,7 +176,6 @@ CertificateHistory::CertificateHistory(HistoryList &_historyCertData, QWidget *p
 	ui->view->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 	ui->view->header()->setSectionResizeMode(0, QHeaderView::Stretch);
 	ui->view->sortItems(0, Qt::AscendingOrder);
-	adjustSize();
 }
 
 CertificateHistory::~CertificateHistory()
diff --git a/client/dialogs/CertificateHistory.h b/client/dialogs/CertificateHistory.h
index adda94907..a3183b38d 100644
--- a/client/dialogs/CertificateHistory.h
+++ b/client/dialogs/CertificateHistory.h
@@ -49,7 +49,7 @@ class HistoryList: public QList<HistoryCertData>
 public:
 	HistoryList();
 
-	void addAndSave(const QList<SslCertificate> &data);
+	void addAndSave(const SslCertificate &cert);
 	void removeAndSave(const QList<HistoryCertData> &data);
 
 private:
diff --git a/client/dialogs/CertificateHistory.ui b/client/dialogs/CertificateHistory.ui
index ccba45015..6a103f844 100644
--- a/client/dialogs/CertificateHistory.ui
+++ b/client/dialogs/CertificateHistory.ui
@@ -18,30 +18,60 @@
   </property>
   <property name="styleSheet">
    <string notr="true">QWidget {
-color: #000000;
-background-color: #FFFFFF;
-}
-QPushButton {
-border-radius: 2px;
-border: none;
-color: #FFFFFF;
-background-color: #006EB5;
-}
-QPushButton:pressed {
-background-color: #41B6E6;
+color: #07142A;
+font-family: Roboto, Helvetica;
+font-size: 14px;
 }
-QPushButton:hover:!pressed {
-background-color: #008DCF;
+#label {
+color: #003168;
+font-size: 20px;
+font-weight: 700;
 }
-QPushButton:disabled {
-background-color: #BEDBED;
+#CertificateHistory {
+background-color: #FFFFFF;
 }</string>
   </property>
-  <layout class="QGridLayout" name="CertificateHistoryLayout">
-   <item row="0" column="0" colspan="4">
-    <widget class="QTreeWidget" name="view">
-     <property name="styleSheet">
-      <string notr="true">#view {
+  <layout class="QVBoxLayout" name="CertificateHistoryLayout">
+   <property name="spacing">
+    <number>0</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>
+    <layout class="QVBoxLayout" name="bodyLayout">
+     <property name="spacing">
+      <number>24</number>
+     </property>
+     <property name="leftMargin">
+      <number>24</number>
+     </property>
+     <property name="topMargin">
+      <number>24</number>
+     </property>
+     <property name="rightMargin">
+      <number>24</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Last used certificates</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTreeWidget" name="view">
+       <property name="styleSheet">
+        <string notr="true">#view {
 	border:none;
 }
 QHeaderView::section {
@@ -60,159 +90,179 @@ QHeaderView::down-arrow {
 	width: 7px;
 	padding-right: 5px;
 }</string>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::CurrentChanged|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::MultiSelection</enum>
-     </property>
-     <property name="rootIsDecorated">
-      <bool>false</bool>
-     </property>
-     <property name="sortingEnabled">
-      <bool>true</bool>
-     </property>
-     <property name="columnCount">
-      <number>4</number>
-     </property>
-     <attribute name="headerShowSortIndicator" stdset="0">
-      <bool>true</bool>
-     </attribute>
-     <attribute name="headerStretchLastSection">
-      <bool>false</bool>
-     </attribute>
-     <column>
-      <property name="text">
-       <string>Owner</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Type</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Issuer</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Expiry date</string>
-      </property>
-     </column>
-    </widget>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::CurrentChanged|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::MultiSelection</enum>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="columnCount">
+        <number>4</number>
+       </property>
+       <attribute name="headerShowSortIndicator" stdset="0">
+        <bool>true</bool>
+       </attribute>
+       <attribute name="headerStretchLastSection">
+        <bool>false</bool>
+       </attribute>
+       <column>
+        <property name="text">
+         <string>Owner</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Type</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Issuer</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Expiry date</string>
+        </property>
+        <property name="textAlignment">
+         <set>AlignCenter</set>
+        </property>
+       </column>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="1" column="0">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
+   <item>
+    <widget class="QWidget" name="navigationArea" native="true">
+     <property name="minimumSize">
       <size>
-       <width>25</width>
-       <height>18</height>
+       <width>0</width>
+       <height>48</height>
       </size>
      </property>
-    </spacer>
-   </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="close">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="minimumSize">
+     <property name="maximumSize">
       <size>
-       <width>120</width>
-       <height>30</height>
+       <width>16777215</width>
+       <height>48</height>
       </size>
      </property>
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-      </font>
-     </property>
-     <property name="accessibleName">
-      <string extracomment="accessible">Close</string>
-     </property>
      <property name="styleSheet">
-      <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #981E32;
+      <string notr="true">#navigationArea {
+border-top: 1px solid #E7EAEF;
+background-color: #F3F5F7;
 }
-QPushButton:pressed {
-	background-color: #F24A66;
+QPushButton {
+padding: 10px 12px;
+border: 1px solid #2F70B6;
+border-radius: 4px;
+color: #ffffff;
+background-color: #2F70B6;
+font-size: 12px;
+font-weight: 700;
 }
-QPushButton:hover:!pressed {
-	background-color: #CD2541;
+QPushButton:hover {
+border-color: #2B66A6;
+background-color: #2B66A6;
 }
-QPushButton:disabled {
-	background-color: #BEDBED;
+QPushButton:pressed {
+border-color: #215081;
+background-color: #215081;
 }
 QPushButton:disabled {
-	background-color: #BEDBED;
+border-color: #82A9D3;
+background-color: #82A9D3;
+}
+QPushButton:default {
+background-color: transparent;
+border-color: #AD2A45;
+color: #AD2A45;
+}
+QPushButton:default:hover {
+background-color: #F5EBED;
+}
+QPushButton:default:pressed {
+background-color: #E1C1C6;
 }</string>
      </property>
-     <property name="text">
-      <string>CLOSE</string>
-     </property>
-     <property name="default">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="select">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>120</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-      </font>
-     </property>
-     <property name="accessibleName">
-      <string extracomment="accessible">Select</string>
-     </property>
-     <property name="text">
-      <string>ADD</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3">
-    <widget class="QPushButton" name="remove">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>120</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-      </font>
-     </property>
-     <property name="accessibleName">
-      <string extracomment="accessible">Remove</string>
-     </property>
-     <property name="text">
-      <string>REMOVE</string>
-     </property>
+     <layout class="QHBoxLayout" name="navigationAreaLayout">
+      <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>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>590</width>
+          <height>15</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="close">
+        <property name="accessibleName">
+         <string extracomment="accessible">Close</string>
+        </property>
+        <property name="text">
+         <string>CLOSE</string>
+        </property>
+        <property name="default">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="select">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Add</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="remove">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Remove</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
diff --git a/client/dialogs/KeyDialog.cpp b/client/dialogs/KeyDialog.cpp
index 1fdac3556..69f43f9ce 100644
--- a/client/dialogs/KeyDialog.cpp
+++ b/client/dialogs/KeyDialog.cpp
@@ -21,46 +21,34 @@
 #include "ui_KeyDialog.h"
 
 #include "CryptoDoc.h"
-#include "Styles.h"
-#include "SslCertificate.h"
 #include "effects/Overlay.h"
 #include "dialogs/CertificateDetails.h"
 
-#include <memory>
-
 KeyDialog::KeyDialog( const CKey &k, QWidget *parent )
 	: QDialog( parent )
 {
-	auto d = std::make_unique<Ui::KeyDialog>();
-	d->setupUi(this);
+	Ui::KeyDialog d;
+	d.setupUi(this);
 #if defined (Q_OS_WIN)
-	d->buttonLayout->setDirection(QBoxLayout::RightToLeft);
+	d.buttonLayout->setDirection(QBoxLayout::RightToLeft);
 #endif
 	setWindowFlags(Qt::Dialog|Qt::CustomizeWindowHint);
 	setAttribute(Qt::WA_DeleteOnClose);
 	new Overlay(this);
 
-	QFont condensed = Styles::font(Styles::Condensed, 12);
-	QFont regular = Styles::font(Styles::Regular, 14);
-	d->close->setFont(condensed);
-	d->showCert->setFont(condensed);
-	d->view->header()->setFont(regular);
-	d->view->setFont(regular);
-	d->view->setHeaderLabels({tr("Attribute"), tr("Value")});
-
-	connect(d->close, &QPushButton::clicked, this, &KeyDialog::accept);
-	connect(d->showCert, &QPushButton::clicked, this, [this, cert=k.cert] {
+	connect(d.close, &QPushButton::clicked, this, &KeyDialog::accept);
+	connect(d.showCert, &QPushButton::clicked, this, [this, cert=k.cert] {
 		CertificateDetails::showCertificate(cert, this);
 	});
-	d->showCert->setHidden(k.cert.isNull());
+	d.showCert->setHidden(k.cert.isNull());
 
-	auto addItem = [&](const QString &parameter, const QString &value) {
+	auto addItem = [view = d.view](const QString &parameter, const QString &value) {
 		if(value.isEmpty())
 			return;
-		auto *i = new QTreeWidgetItem(d->view);
+		auto *i = new QTreeWidgetItem(view);
 		i->setText(0, parameter);
 		i->setText(1, value);
-		d->view->addTopLevelItem(i);
+		view->addTopLevelItem(i);
 	};
 
 	addItem(tr("Recipient"), k.recipient);
@@ -68,7 +56,7 @@ KeyDialog::KeyDialog( const CKey &k, QWidget *parent )
 	addItem(tr("Key server ID"), k.keyserver_id);
 	addItem(tr("Transaction ID"), k.transaction_id);
 	addItem(tr("Expiry date"), k.cert.expiryDate().toLocalTime().toString(QStringLiteral("dd.MM.yyyy hh:mm:ss")));
-	addItem(tr("Issuer"), SslCertificate(k.cert).issuerInfo(QSslCertificate::CommonName));
-	d->view->resizeColumnToContents( 0 );
+	addItem(tr("Issuer"), k.cert.issuerInfo(QSslCertificate::CommonName).join(' '));
+	d.view->resizeColumnToContents( 0 );
 	adjustSize();
 }
diff --git a/client/dialogs/KeyDialog.ui b/client/dialogs/KeyDialog.ui
index 77c859344..095698d5b 100644
--- a/client/dialogs/KeyDialog.ui
+++ b/client/dialogs/KeyDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>222</height>
+    <width>515</width>
+    <height>369</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -20,24 +20,72 @@
    <string>Encrypt for</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">QWidget{ background-color: #FFFFFF; border: none;}
-QWidget#KeyDialog{ border-radius: 2px; }
-</string>
+   <string notr="true">QWidget {
+color: #07142A;
+font-family: Roboto, Helvetica;
+font-size: 14px;
+}
+#KeyDialog {
+background-color: #FFFFFF;
+border-radius: 4px;
+}
+QHeaderView::section {
+border: 1px solid #E7EAEF;
+border-width: 0px 0px 1px 0px;
+padding: 0px 0px 8px 5px;
+background-color: #FFFFFF;
+}
+QPushButton {
+padding: 12px 12px;
+border-radius: 4px;
+border: 1px solid #AD2A45;
+color: #AD2A45;
+font-weight: 700;
+}
+QPushButton:hover {
+background-color: #F5EBED;
+}
+QPushButton:pressed {
+background-color: #E1C1C6;
+}
+QPushButton:default {
+color: #ffffff;
+border-color: #2F70B6;
+background-color: #2F70B6;
+}
+QPushButton:default:hover {
+border-color: #2B66A6;
+background-color: #2B66A6;
+}
+QPushButton:default:pressed {
+border-color: #215081;
+background-color: #215081;
+}
+QPushButton:default:disabled {
+border-color: #82A9D3;
+background-color: #82A9D3;
+}</string>
   </property>
   <layout class="QVBoxLayout" name="KeyDialogLayout">
+   <property name="spacing">
+    <number>40</number>
+   </property>
+   <property name="leftMargin">
+    <number>40</number>
+   </property>
+   <property name="topMargin">
+    <number>32</number>
+   </property>
+   <property name="rightMargin">
+    <number>40</number>
+   </property>
+   <property name="bottomMargin">
+    <number>32</number>
+   </property>
    <item>
     <widget class="QTreeWidget" name="view">
-     <property name="styleSheet">
-      <string notr="true">#view {
-	border:none;
-}
-QHeaderView::section {
-	border: 1px solid #D9D9D8;
-	border-width: 0px 0px 1px 0px;
-	padding: 2px 0px 3px 5px;
-	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-                                      stop:0 #FFFFFF, stop:1 #FFFFFF);
-}</string>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
      </property>
      <property name="rootIsDecorated">
       <bool>false</bool>
@@ -56,8 +104,24 @@ QHeaderView::section {
    </item>
    <item>
     <layout class="QHBoxLayout" name="buttonLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="close">
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
+       <property name="text">
+        <string>Close</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
      <item>
-      <spacer name="leftSpacer">
+      <spacer name="buttonSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -70,110 +134,29 @@ QHeaderView::section {
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="close">
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>34</height>
-        </size>
-       </property>
+      <widget class="QPushButton" name="showCert">
        <property name="font">
         <font>
-         <pointsize>14</pointsize>
+         <family>Roboto</family>
+         <pointsize>-1</pointsize>
+         <bold>true</bold>
         </font>
        </property>
        <property name="cursor">
         <cursorShape>PointingHandCursor</cursorShape>
        </property>
-       <property name="accessibleName">
-        <string extracomment="accessible">Close</string>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #981E32;
-}
-QPushButton:pressed {
-	background-color: #F24A66;
-}
-QPushButton:hover:!pressed {
-	background-color: #CD2541;
-}
-QPushButton:disabled {
-	background-color: #BEDBED;
-}</string>
-       </property>
        <property name="text">
-        <string>CLOSE</string>
+        <string>Show certificate</string>
        </property>
        <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="showCert">
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>34</height>
-        </size>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-        </font>
-       </property>
-       <property name="cursor">
-        <cursorShape>PointingHandCursor</cursorShape>
-       </property>
-       <property name="accessibleName">
-        <string extracomment="accessible">Show certificate</string>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QPushButton {
-	border-radius: 2px; 
-	border: none;
-	color: #ffffff;
-	background-color: #006EB5;
-}
-QPushButton:pressed {
-	background-color: #41B6E6;
-}
-QPushButton:hover:!pressed {
-	background-color: #008DCF;
-}
-QPushButton:disabled {
-	background-color: #BEDBED;
-}</string>
-       </property>
-       <property name="text">
-        <string>SHOW CERTIFICATE</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="rightSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>25</width>
-         <height>18</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
- <slots>
-  <slot>showCertificate()</slot>
- </slots>
 </ui>
diff --git a/client/dialogs/MobileDialog.ui b/client/dialogs/MobileDialog.ui
index f539fc765..4817dd2f4 100644
--- a/client/dialogs/MobileDialog.ui
+++ b/client/dialogs/MobileDialog.ui
@@ -90,13 +90,16 @@ border-color: #2F70B6;
 background-color: #2F70B6;
 }
 QPushButton:default:hover {
+border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton:default:pressed {
+border-color: #215081;
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
   </property>
   <layout class="QVBoxLayout" name="MobileDialogLayout">
diff --git a/client/dialogs/MobileProgress.ui b/client/dialogs/MobileProgress.ui
index e0ac56d27..9b0a2afdc 100644
--- a/client/dialogs/MobileProgress.ui
+++ b/client/dialogs/MobileProgress.ui
@@ -47,13 +47,16 @@ border-color: #2F70B6;
 background-color: #2F70B6;
 }
 QPushButton:default:hover {
+border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton:default:pressed {
+border-color: #215081;
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
   </property>
   <layout class="QVBoxLayout" name="MobileProgressLayout">
diff --git a/client/dialogs/PinPopup.ui b/client/dialogs/PinPopup.ui
index 79ecdd113..c155e6579 100644
--- a/client/dialogs/PinPopup.ui
+++ b/client/dialogs/PinPopup.ui
@@ -58,13 +58,16 @@ border-color: #2F70B6;
 background-color: #2F70B6;
 }
 QPushButton:default:hover {
+border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton:default:pressed {
+border-color: #215081;
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
   </property>
   <layout class="QVBoxLayout" name="PinPopupLayout" stretch="0,0,0">
diff --git a/client/dialogs/PinUnblock.ui b/client/dialogs/PinUnblock.ui
index 14656ace6..f91e948db 100644
--- a/client/dialogs/PinUnblock.ui
+++ b/client/dialogs/PinUnblock.ui
@@ -58,13 +58,16 @@ border-color: #2F70B6;
 background-color: #2F70B6;
 }
 QPushButton:default:hover {
+border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton:default:pressed {
+border-color: #215081;
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
   </property>
   <layout class="QVBoxLayout" name="PinUnblockLayout">
diff --git a/client/dialogs/RoleAddressDialog.ui b/client/dialogs/RoleAddressDialog.ui
index 5c69a00fd..69eaf4f2c 100644
--- a/client/dialogs/RoleAddressDialog.ui
+++ b/client/dialogs/RoleAddressDialog.ui
@@ -58,13 +58,16 @@ border-color: #2F70B6;
 background-color: #2F70B6;
 }
 QPushButton:default:hover {
+border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton:default:pressed {
+border-color: #215081;
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
   </property>
   <layout class="QVBoxLayout" name="SmartIDDialogLayout">
diff --git a/client/dialogs/SettingsDialog.ui b/client/dialogs/SettingsDialog.ui
index aa80b3267..73d5709f8 100644
--- a/client/dialogs/SettingsDialog.ui
+++ b/client/dialogs/SettingsDialog.ui
@@ -265,7 +265,7 @@ QPushButton:default:pressed {
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+background-color: #82A9D3;
 }</string>
      </property>
      <layout class="QHBoxLayout" name="navigationAreaLayout" stretch="1,0,0,0,0,0,0,0,0">
diff --git a/client/dialogs/SmartIDDialog.ui b/client/dialogs/SmartIDDialog.ui
index 2132ff252..5901977c5 100644
--- a/client/dialogs/SmartIDDialog.ui
+++ b/client/dialogs/SmartIDDialog.ui
@@ -126,13 +126,16 @@ border-color: #2F70B6;
 background-color: #2F70B6;
 }
 QPushButton:default:hover {
+border-color: #2B66A6;
 background-color: #2B66A6;
 }
 QPushButton:default:pressed {
+border-color: #215081;
 background-color: #215081;
 }
 QPushButton:default:disabled {
-background-color: #2F70B6;
+border-color: #82A9D3;
+background-color: #82A9D3;
 }</string>
   </property>
   <layout class="QVBoxLayout" name="SmartIDDialogLayout">
diff --git a/client/translations/en.ts b/client/translations/en.ts
index 277107699..3f9c3e552 100644
--- a/client/translations/en.ts
+++ b/client/translations/en.ts
@@ -15,26 +15,6 @@
 </context>
 <context>
     <name>AddRecipients</name>
-    <message>
-        <source>CANCEL</source>
-        <translation>CANCEL</translation>
-    </message>
-    <message>
-        <source>CONFIRM</source>
-        <translation>CONFIRM</translation>
-    </message>
-    <message>
-        <source>CERTIFICATE FROM CARD</source>
-        <translation>CERTIFICATE FROM CARD</translation>
-    </message>
-    <message>
-        <source>CERTIFICATE FROM FILE</source>
-        <translation>CERTIFICATE FROM FILE</translation>
-    </message>
-    <message>
-        <source>LATEST USED CERTIFICATE</source>
-        <translation>LATEST USED CERTIFICATE</translation>
-    </message>
     <message>
         <source>Failed to read certificate</source>
         <translation>Failed to read certificate</translation>
@@ -65,27 +45,22 @@
     </message>
     <message>
         <source>Certificate from card</source>
-        <extracomment>accessible</extracomment>
         <translation>Certificate from card</translation>
     </message>
     <message>
         <source>Certificate from file</source>
-        <extracomment>accessible</extracomment>
         <translation>Certificate from file</translation>
     </message>
     <message>
         <source>Latest used certificate</source>
-        <extracomment>accessible</extracomment>
         <translation>Latest used certificate</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <extracomment>accessible</extracomment>
         <translation>Cancel</translation>
     </message>
     <message>
         <source>Confirm</source>
-        <extracomment>accessible</extracomment>
         <translation>Confirm</translation>
     </message>
     <message>
@@ -298,14 +273,6 @@
         <source>Certificate details</source>
         <translation>Certificate details</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>CLOSE</translation>
-    </message>
-    <message>
-        <source>SAVE</source>
-        <translation>SAVE</translation>
-    </message>
     <message>
         <source>This certificate is intended for following purpose(s):</source>
         <translation>This certificate is intended for following purpose(s):</translation>
@@ -404,12 +371,10 @@
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Close</translation>
     </message>
     <message>
         <source>Save</source>
-        <extracomment>accessible</extracomment>
         <translation>Save</translation>
     </message>
 </context>
@@ -419,10 +384,6 @@
         <source>CLOSE</source>
         <translation>CLOSE</translation>
     </message>
-    <message>
-        <source>REMOVE</source>
-        <translation>REMOVE</translation>
-    </message>
     <message>
         <source>Owner</source>
         <translation>Owner</translation>
@@ -460,14 +421,8 @@
         <extracomment>accessible</extracomment>
         <translation>Close</translation>
     </message>
-    <message>
-        <source>Select</source>
-        <extracomment>accessible</extracomment>
-        <translation>Select</translation>
-    </message>
     <message>
         <source>Remove</source>
-        <extracomment>accessible</extracomment>
         <translation>Remove</translation>
     </message>
     <message>
@@ -475,8 +430,12 @@
         <translation>Certificate for Encryption</translation>
     </message>
     <message>
-        <source>ADD</source>
-        <translation>ADD</translation>
+        <source>Last used certificates</source>
+        <translation>Last used certificates</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Add</translation>
     </message>
 </context>
 <context>
@@ -1289,14 +1248,6 @@
         <source>Value</source>
         <translation>Value</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>CLOSE</translation>
-    </message>
-    <message>
-        <source>SHOW CERTIFICATE</source>
-        <translation>SHOW CERTIFICATE</translation>
-    </message>
     <message>
         <source>ConcatKDF digest method</source>
         <translation>ConcatKDF digest method</translation>
@@ -1307,12 +1258,10 @@
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Close</translation>
     </message>
     <message>
         <source>Show certificate</source>
-        <extracomment>accessible</extracomment>
         <translation>Show certificate</translation>
     </message>
     <message>
@@ -2623,10 +2572,6 @@ Additional licenses and components</translation>
         <source>Signature</source>
         <translation>Signature</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>CLOSE</translation>
-    </message>
     <message>
         <source>Attribute</source>
         <translation>Attribute</translation>
@@ -2775,7 +2720,6 @@ Additional licenses and components</translation>
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Close</translation>
     </message>
     <message>
diff --git a/client/translations/et.ts b/client/translations/et.ts
index 6bdb232f1..e0de422ee 100644
--- a/client/translations/et.ts
+++ b/client/translations/et.ts
@@ -15,26 +15,6 @@
 </context>
 <context>
     <name>AddRecipients</name>
-    <message>
-        <source>CANCEL</source>
-        <translation>KATKESTA</translation>
-    </message>
-    <message>
-        <source>CONFIRM</source>
-        <translation>KINNITA</translation>
-    </message>
-    <message>
-        <source>CERTIFICATE FROM CARD</source>
-        <translation>LISA SERTIFIKAAT KAARDILT</translation>
-    </message>
-    <message>
-        <source>CERTIFICATE FROM FILE</source>
-        <translation>LISA SERTIFIKAAT FAILIST</translation>
-    </message>
-    <message>
-        <source>LATEST USED CERTIFICATE</source>
-        <translation>VIIMATI LISATUD</translation>
-    </message>
     <message>
         <source>Failed to read certificate</source>
         <translation>Sertifikaadi lugemine ebaõnnestus</translation>
@@ -65,27 +45,22 @@
     </message>
     <message>
         <source>Certificate from card</source>
-        <extracomment>accessible</extracomment>
         <translation>Lisa sertifikaat kaardilt</translation>
     </message>
     <message>
         <source>Certificate from file</source>
-        <extracomment>accessible</extracomment>
         <translation>Lisa sertifikaat failist</translation>
     </message>
     <message>
         <source>Latest used certificate</source>
-        <extracomment>accessible</extracomment>
         <translation>Viimati lisatud</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <extracomment>accessible</extracomment>
         <translation>Katkesta</translation>
     </message>
     <message>
         <source>Confirm</source>
-        <extracomment>accessible</extracomment>
         <translation>Kinnita</translation>
     </message>
     <message>
@@ -298,14 +273,6 @@
         <source>Certificate details</source>
         <translation>Sertifikaadi detailid</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>SULGE</translation>
-    </message>
-    <message>
-        <source>SAVE</source>
-        <translation>SALVESTA</translation>
-    </message>
     <message>
         <source>This certificate is intended for following purpose(s):</source>
         <translation>Selle sertifikaadi otstarve on:</translation>
@@ -404,12 +371,10 @@
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Sulge</translation>
     </message>
     <message>
         <source>Save</source>
-        <extracomment>accessible</extracomment>
         <translation>Salvesta</translation>
     </message>
 </context>
@@ -419,10 +384,6 @@
         <source>CLOSE</source>
         <translation>SULGE</translation>
     </message>
-    <message>
-        <source>REMOVE</source>
-        <translation>EEMALDA</translation>
-    </message>
     <message>
         <source>Owner</source>
         <translation>Omanik</translation>
@@ -460,14 +421,8 @@
         <extracomment>accessible</extracomment>
         <translation>Sulge</translation>
     </message>
-    <message>
-        <source>Select</source>
-        <extracomment>accessible</extracomment>
-        <translation>Lisa</translation>
-    </message>
     <message>
         <source>Remove</source>
-        <extracomment>accessible</extracomment>
         <translation>Eemalda</translation>
     </message>
     <message>
@@ -475,8 +430,12 @@
         <translation>Krüpteerimissertifikaat</translation>
     </message>
     <message>
-        <source>ADD</source>
-        <translation>LISA</translation>
+        <source>Last used certificates</source>
+        <translation>Viimati lisatud sertifikaadid</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Lisa</translation>
     </message>
 </context>
 <context>
@@ -1289,14 +1248,6 @@
         <source>Value</source>
         <translation>Väärtus</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>SULGE</translation>
-    </message>
-    <message>
-        <source>SHOW CERTIFICATE</source>
-        <translation>NÄITA SERTIFIKAATI</translation>
-    </message>
     <message>
         <source>ConcatKDF digest method</source>
         <translation>ConcatKDF referaatmeetod</translation>
@@ -1307,12 +1258,10 @@
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Sulge</translation>
     </message>
     <message>
         <source>Show certificate</source>
-        <extracomment>accessible</extracomment>
         <translation>Näita sertifikaati</translation>
     </message>
     <message>
@@ -2623,10 +2572,6 @@ Täiendavad litsentsid ja komponendid</translation>
         <source>Signature</source>
         <translation>Allkiri</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>SULGE</translation>
-    </message>
     <message>
         <source>Attribute</source>
         <translation>Atribuut</translation>
@@ -2775,7 +2720,6 @@ Täiendavad litsentsid ja komponendid</translation>
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Sulge</translation>
     </message>
     <message>
diff --git a/client/translations/ru.ts b/client/translations/ru.ts
index 8022b67b3..92e8d09d5 100644
--- a/client/translations/ru.ts
+++ b/client/translations/ru.ts
@@ -15,26 +15,6 @@
 </context>
 <context>
     <name>AddRecipients</name>
-    <message>
-        <source>CANCEL</source>
-        <translation>ОТМЕНА</translation>
-    </message>
-    <message>
-        <source>CONFIRM</source>
-        <translation>ПОДТВЕРДИТЬ</translation>
-    </message>
-    <message>
-        <source>CERTIFICATE FROM CARD</source>
-        <translation>СЕРТИФИКАТ С КАРТЫ</translation>
-    </message>
-    <message>
-        <source>CERTIFICATE FROM FILE</source>
-        <translation>СЕРТИФИКАТ ИЗ ФАЙЛА</translation>
-    </message>
-    <message>
-        <source>LATEST USED CERTIFICATE</source>
-        <translation>ПОСЛЕДНИЙ СЕРТИФИКАТ</translation>
-    </message>
     <message>
         <source>Failed to read certificate</source>
         <translation>Не удалось прочитать сертификат</translation>
@@ -49,7 +29,7 @@
     </message>
     <message>
         <source>Person or company does not own a valid certificate.&lt;br /&gt;It is necessary to have a valid certificate for encryption.&lt;br /&gt;&lt;a href=&apos;https://www.id.ee/en/article/encryption-and-decryption-of-documents/&apos;&gt;Read more about it&lt;/a&gt;.</source>
-        <translation>У человека или предприятия отсутствует действующий сертификат.&lt;br /&gt;Для шифрования нужен действующий сертификат.&lt;br /&gt;&lt;a href=&apos;https://www.id.ee/ru/artikkel/shifrovanie-i-deshifrovka-dokumentov/&apos;&gt;Точнее можно прочитать&lt;/a&gt;</translation>
+        <translation>У человека или предприятия отсутствует действующий сертификат.&lt;br /&gt;Для шифрования нужен действующий сертификат.&lt;br /&gt;&lt;a href=&apos;https://www.id.ee/ru/artikkel/shifrovanie-i-deshifrovka-dokumentov/&apos;&gt;Точнее можно прочитать&lt;/a&gt;.</translation>
     </message>
     <message>
         <source>Certificates (*.cer *.crt *.pem)</source>
@@ -65,27 +45,22 @@
     </message>
     <message>
         <source>Certificate from card</source>
-        <extracomment>accessible</extracomment>
         <translation>Сертификат с карты</translation>
     </message>
     <message>
         <source>Certificate from file</source>
-        <extracomment>accessible</extracomment>
         <translation>Сертификат из файла</translation>
     </message>
     <message>
         <source>Latest used certificate</source>
-        <extracomment>accessible</extracomment>
         <translation>Последний сертификат</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <extracomment>accessible</extracomment>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Confirm</source>
-        <extracomment>accessible</extracomment>
         <translation>Подтвердить</translation>
     </message>
     <message>
@@ -298,14 +273,6 @@
         <source>Certificate details</source>
         <translation>Сведения о сертификате</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>ЗАКРЫТЬ</translation>
-    </message>
-    <message>
-        <source>SAVE</source>
-        <translation>СОХРАНИТЬ</translation>
-    </message>
     <message>
         <source>This certificate is intended for following purpose(s):</source>
         <translation>Этот сертификат предназначен для следующих целей:</translation>
@@ -404,12 +371,10 @@
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>Save</source>
-        <extracomment>accessible</extracomment>
         <translation>Сохранить</translation>
     </message>
 </context>
@@ -419,10 +384,6 @@
         <source>CLOSE</source>
         <translation>ЗАКРЫТЬ</translation>
     </message>
-    <message>
-        <source>REMOVE</source>
-        <translation>УДАЛИТЬ</translation>
-    </message>
     <message>
         <source>Owner</source>
         <translation>Владелец</translation>
@@ -460,14 +421,8 @@
         <extracomment>accessible</extracomment>
         <translation>Закрыть</translation>
     </message>
-    <message>
-        <source>Select</source>
-        <extracomment>accessible</extracomment>
-        <translation>Выбрать</translation>
-    </message>
     <message>
         <source>Remove</source>
-        <extracomment>accessible</extracomment>
         <translation>Удалить</translation>
     </message>
     <message>
@@ -475,8 +430,12 @@
         <translation>Сертификат шифрования</translation>
     </message>
     <message>
-        <source>ADD</source>
-        <translation>ДОБАВИТЬ</translation>
+        <source>Last used certificates</source>
+        <translation>Последний сертификат</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Добавить</translation>
     </message>
 </context>
 <context>
@@ -1289,14 +1248,6 @@
         <source>Value</source>
         <translation>Значение</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>ЗАКРЫТЬ</translation>
-    </message>
-    <message>
-        <source>SHOW CERTIFICATE</source>
-        <translation>ПОКАЗАТЬ СЕРТИФИКАТ</translation>
-    </message>
     <message>
         <source>ConcatKDF digest method</source>
         <translation>Метод подсчета ConcatKDF</translation>
@@ -1307,12 +1258,10 @@
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>Show certificate</source>
-        <extracomment>accessible</extracomment>
         <translation>Показать сертификат</translation>
     </message>
     <message>
@@ -2624,10 +2573,6 @@ Additional licenses and components</source>
         <source>Signature</source>
         <translation>Подпись</translation>
     </message>
-    <message>
-        <source>CLOSE</source>
-        <translation>ЗАКРЫТЬ</translation>
-    </message>
     <message>
         <source>Attribute</source>
         <translation>Атрибут</translation>
@@ -2776,7 +2721,6 @@ Additional licenses and components</source>
     </message>
     <message>
         <source>Close</source>
-        <extracomment>accessible</extracomment>
         <translation>Закрыть</translation>
     </message>
     <message>