3 files changed, 9 insertions, 7 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c60bdac3..d5dd4a6e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -55,7 +55,7 @@ target_sources(gpgfrontend_core PRIVATE
   ${CMAKE_SOURCE_DIR}/third_party/qt-aes/qaesencryption.cpp)
 
 # link gnupg libraries
-target_link_libraries(gpgfrontend_core PUBLIC gpgme assuan gpg-error)
+target_link_libraries(gpgfrontend_core PUBLIC gpgme ${LIBASSUAN_LIBRARIES} gpg-error)
 
 # link openssl
 target_link_libraries(gpgfrontend_core PUBLIC OpenSSL::SSL OpenSSL::Crypto)
diff --git a/src/core/function/gpg/GpgSmartCardManager.cpp b/src/core/function/gpg/GpgSmartCardManager.cpp
index 83f3a45d..976b7fd1 100644
--- a/src/core/function/gpg/GpgSmartCardManager.cpp
+++ b/src/core/function/gpg/GpgSmartCardManager.cpp
@@ -252,10 +252,11 @@ auto GpgSmartCardManager::ModifyPin(const QString& pin_ref)
   return {err, status.join(' ')};
 }
 
-auto GpgSmartCardManager::GenerateKey(
-    const QString& serial_number, const QString& name, const QString& email,
-    const QString& comment, const QDateTime& expire,
-    bool non_expire) -> std::tuple<GpgError, QString> {
+auto GpgSmartCardManager::GenerateKey(const QString& serial_number,
+                                      const QString& name, const QString& email,
+                                      const QString& comment,
+                                      const QDateTime& expire, bool non_expire)
+    -> std::tuple<GpgError, QString> {
   if (name.isEmpty() || email.isEmpty()) {
     return {GPG_ERR_INV_ARG, "name or email is empty"};
   }
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp
index 5f896fd5..eed6a054 100644
--- a/src/ui/GpgFrontendApplication.cpp
+++ b/src/ui/GpgFrontendApplication.cpp
@@ -35,8 +35,9 @@ namespace GpgFrontend::UI {
 GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[])
     : QApplication(argc, argv) {
 #if !(defined(__APPLE__) && defined(__MACH__))
-  GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(
-      QIcon(":/icons/gpgfrontend.png"));
+  // Try system theme icon first, fall back to resource
+  QIcon appIcon = QIcon::fromTheme("gpgfrontend", QIcon(":/icons/gpgfrontend.png"));
+  GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(appIcon);
 #endif
 
   QString application_display_name = GetProjectName();