Fix for the invalid icon issue (same as #15)