Icon changes

- Equalized icon width
- Hide icon span when not needed