Icon refactoring

You earlier said you liked the texture change I made in my code (since then rebased and gone). Here it is, without any enums.