Attempted to cherry-pick @kes1's commits into master

I think we're using master now, so have used git cherry-pick to move these commits over. This PR is open for review :)

Not sure if this worked as Config.Designer.cs completely changed between those branches (I think) - hard to tell as git thinks it is a binary! Tried to force set it to be diffable... 

If anyone wants to test this out (I'm still without Windows...) here's the zip:

https://github.com/mapaction/mapaction-toolbox/archive/bugfix/fonts-and-spaces.zip

@kes1 @clairebyrne