minor refactor; sadly the markup is there but the icons aren't showing yet #417