Fixed issues Add some icons