Renamings, icon helpers added