Bug-fix: Fixed problem with icon display.
Merge branch 'master-dev' of https://github.com/foxhide/PKSU-Gruppearbejde into master-dev