Several fixes for the catalogue
Fix frontpage
resources-icons rewrites
fix merge
fix icons