updated icons and stripping whitespace from token