Fixing x vs. <3 and refactoring icons a bit.