Some corrections
Correct case of some icon
Relocalise some code
Merge pull request #265 from gadcam/master

Corrections