Minor refactoring

[ghost]

• Changed the icon type parsers to a switch (eliminated some code duplication :))
• Fixed some comparison operators

[kormyen]

Thanks heaps for the pull request! :D

Funny I touched similar refactoring just yesterday including changing to switch statements, but your changes look cleaner. https://github.com/kormyen/memex/commit/233a24b3172ed933373f590e1b89992066d2c1c5