Code and some all icon update for things.
Merge pull request #6 from Nienhaus/master

Code and some small  icon fixes for things