replaced icons
Merge pull request #289 from Catrobat/Icons

Replaced icons
refactor some code
Merge branch 'master' into Issue#250