Icon and other small modifications