diff --git a/src/appicon.c b/src/appicon.c
index 902559c2..9f51daca 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -240,6 +240,8 @@ void paint_app_icon(WApplication *wapp)
 
 void removeAppIconFor(WApplication *wapp)
 {
+	char *file = NULL;
+
 	if (!wapp->app_icon)
 		return;
 
@@ -256,6 +258,14 @@ void removeAppIconFor(WApplication *wapp)
 		wapp->app_icon->icon->icon_win = None;
 
 		/* Update the icon images */
+		/* Search the icon using instance and class, without default icon */
+		file = get_icon_filename(wapp->app_icon->icon->core->screen_ptr, wapp->app_icon->wm_instance, wapp->app_icon->wm_class, wapp->app_icon->command, False);
+		if (file) {
+			wapp->app_icon->icon->file = wstrdup(file);
+			wapp->app_icon->icon->file_image = get_rimage_from_file(wapp->app_icon->icon->core->screen_ptr, wapp->app_icon->icon->file, wPreferences.icon_size);
+			wfree(file);
+		}
+
 		wIconUpdate(wapp->app_icon->icon, NULL);
 
 		/* Paint it */