Clean-ups for CURRIKI-6059: missing icons, wrong fetches, ...
paul