HOT FIX: Revise icons