diff --git a/client/dialogs/PinPopup.cpp b/client/dialogs/PinPopup.cpp
index c22dd23f1..b03f04d5f 100644
--- a/client/dialogs/PinPopup.cpp
+++ b/client/dialogs/PinPopup.cpp
@@ -50,6 +50,8 @@ PinPopup::PinPopup(PinFlags flags, const QString &title, TokenFlags count, QWidg
 	ui->setupUi(this);
 	setWindowFlags( Qt::Dialog | Qt::FramelessWindowHint );
 	setFixedSize( size() );
+	for(QLineEdit *w: findChildren<QLineEdit*>())
+		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 
 	QFont regular = Styles::font( Styles::Regular, 14 );
 	QFont condensed14 = Styles::font( Styles::Condensed, 14 );
diff --git a/client/dialogs/PinUnblock.cpp b/client/dialogs/PinUnblock.cpp
index d98cfd4cf..8c822e1b0 100644
--- a/client/dialogs/PinUnblock.cpp
+++ b/client/dialogs/PinUnblock.cpp
@@ -57,6 +57,8 @@ void PinUnblock::init( WorkMode mode, QSmartCardData::PinType type, short leftAt
 	ui->horizontalLayout->setDirection(QBoxLayout::RightToLeft);
 #endif
 	setWindowFlags( Qt::Dialog | Qt::FramelessWindowHint );
+	for(QLineEdit *w: findChildren<QLineEdit*>())
+		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 
 	ui->unblock->setEnabled( false );
 	connect( ui->unblock, &QPushButton::clicked, this, &PinUnblock::accept );
diff --git a/client/dialogs/PinUnblock.h b/client/dialogs/PinUnblock.h
index 8b0ab51c0..e0a0a179d 100644
--- a/client/dialogs/PinUnblock.h
+++ b/client/dialogs/PinUnblock.h
@@ -28,7 +28,7 @@ namespace Ui {
 class PinUnblock;
 }
 
-class PinUnblock : public QDialog
+class PinUnblock final : public QDialog
 {
 	Q_OBJECT
 
diff --git a/client/dialogs/RoleAddressDialog.cpp b/client/dialogs/RoleAddressDialog.cpp
index 223896ac4..0edc1ba43 100644
--- a/client/dialogs/RoleAddressDialog.cpp
+++ b/client/dialogs/RoleAddressDialog.cpp
@@ -47,8 +47,9 @@ RoleAddressDialog::RoleAddressDialog(QWidget *parent)
 #if defined (Q_OS_WIN)
 	d->horizontalLayout->setDirection(QBoxLayout::RightToLeft);
 #endif
-
 	setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint);
+	for(QLineEdit *w: findChildren<QLineEdit*>())
+		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 
 	connect( d->cancel, &QPushButton::clicked, this, &RoleAddressDialog::reject );
 	d->cancel->setFont(condensed);
@@ -81,7 +82,7 @@ RoleAddressDialog::RoleAddressDialog(QWidget *parent)
 			if(list.size() > 10)
 				list.removeLast();
 			d->s.setValue(line->objectName(), QString()); // Uses on Windows MULTI_STRING registry
-			SettingsDialog::setValueEx(line->objectName(), list, QStringList());
+			SettingsDialog::setValueEx(line->objectName(), list);
 		});
 		completer->popup()->setStyleSheet("background-color:#FFFFFF; color: #000000;");
 	}
diff --git a/client/dialogs/RoleAddressDialog.h b/client/dialogs/RoleAddressDialog.h
index 51fb0eec5..66f99a58f 100644
--- a/client/dialogs/RoleAddressDialog.h
+++ b/client/dialogs/RoleAddressDialog.h
@@ -21,7 +21,7 @@
 
 #include <QDialog>
 
-class RoleAddressDialog : public QDialog
+class RoleAddressDialog final : public QDialog
 {
 	Q_OBJECT
 public:
diff --git a/client/dialogs/SettingsDialog.cpp b/client/dialogs/SettingsDialog.cpp
index 89a9bad05..d0868556a 100644
--- a/client/dialogs/SettingsDialog.cpp
+++ b/client/dialogs/SettingsDialog.cpp
@@ -65,6 +65,12 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 	ui->setupUi(this);
 	setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
 	move(parent->geometry().center() - geometry().center());
+	for(QLineEdit *w: findChildren<QLineEdit*>())
+		w->setAttribute(Qt::WA_MacShowFocusRect, false);
+	for(QRadioButton *w: findChildren<QRadioButton*>())
+		w->setAttribute(Qt::WA_MacShowFocusRect, false);
+	for(QCheckBox *w: findChildren<QCheckBox*>())
+		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 
 	QFont headerFont = Styles::font(Styles::Regular, 18, QFont::Bold);
 	QFont regularFont = Styles::font(Styles::Regular, 14);
diff --git a/client/widgets/ItemList.cpp b/client/widgets/ItemList.cpp
index 45d917c48..6ab6f9309 100644
--- a/client/widgets/ItemList.cpp
+++ b/client/widgets/ItemList.cpp
@@ -38,6 +38,7 @@ ItemList::ItemList(QWidget *parent)
 	ui->count->setFont(Styles::font(Styles::Condensed, 12));
 	ui->count->hide();
 	ui->infoIcon->hide();
+	ui->txtFind->setAttribute(Qt::WA_MacShowFocusRect, false);
 	tabIndex = ui->btnFind;
 
 	connect(this, &ItemList::idChanged, this, [this](const SslCertificate &cert){ this->cert = cert; });
@@ -265,10 +266,10 @@ void ItemList::remove(Item *item)
 
 void ItemList::removeItem(int row)
 {
-	if(items.size() < row)
+	if(items.size() < size_t(row))
 		return;
 
-	auto item = items[row];
+	auto item = items[size_t(row)];
 	item->close();
 	items.erase(items.begin()+row);
 }