Add more validation to server icons. Closes #828