Salud iconography and template clean-up