Merge pull request #15 from johanjusits/branch-1

modified status icons to work properly