fix crash & icons