[TASK] Add icon and stop throwing exception