diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
index ee62854f5b9be783a806497eb3934d13e033b7a0..941c9fdf8a412842b8e7bca95418664278967eda 100644
--- a/src/abstract_client.cpp
+++ b/src/abstract_client.cpp
@@ -2832,7 +2832,7 @@ void AbstractClient::makeOthersMinimize()
             continue;
         }
 
-        if (false == c->isMinimized()){
+        if (false == c->isMinimized() && c->transientFor() != nullptr) {
             printf("AbstractClient::makeOthersMinimize, minimize unminimized caption:%s\n", c->caption().toStdString().c_str());
             c->minimize(true);
         }
diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp
index 39d6ea22bc458d102e83d0358c517b604f62afa7..b8e15824235d9d8572821eba2bdd3fc76b41b5c3 100644
--- a/src/waylandclient.cpp
+++ b/src/waylandclient.cpp
@@ -168,6 +168,7 @@ void WaylandClient::updateIcon()
     if (iconName == icon().name()) {
         return;
     }
+    QIcon::setFallbackThemeName("ukui-icon-theme-default");
     setIcon(QIcon::fromTheme(iconName));
 }