Icon helper, tweaks