Refactors code for adding water icon :droplet: