avoiding possible null pointer error
updated icons