Merge pull request #312 from Cipa/develop

fix for #308 and #306 + small icon fix