Removed icons from WS names, cleaned config a little